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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.58 and 1.73

version 1.58, 2002/10/25 19:02:38 version 1.73, 2003/09/22 20:49:01
Line 62  sub start_radiobuttonresponse { Line 62  sub start_radiobuttonresponse {
  $safeeval,'max','randomize');   $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') {
         my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,undef,0);
         if ($type eq '1') {
     $result .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}';
         } elsif ($type eq 'A') {
     $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}';
         } elsif ($type eq 'a') {
     $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}';
         } elsif ($type eq 'i') {
     $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';
         }
       $result .= '\begin{enumerate}';        $result .= '\begin{enumerate}';
   }    }
   return $result;    return $result;
Line 87  sub start_foilgroup { Line 97  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;
 }  }
   
 sub storesurvey {  sub storesurvey {
   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']};
   &Apache::lonxml::debug("Here I am!:$response:");    &Apache::lonxml::debug("Here I am!:$response:");
   if ( $response !~ /[0-9]+/) { return ''; }    if ( $response !~ /[0-9]+/) { return ''; }
   my $id = $Apache::inputtags::response['-1'];    my $id = $Apache::inputtags::response['-1'];
Line 112  sub grade_response { Line 121  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') {
         $response=&Apache::response::getresponse();
     } 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 160  sub end_foilgroup { Line 174  sub end_foilgroup {
       }        }
     }      }
   }    }
     &Apache::lonxml::increment_counter();
   return $result;    return $result;
 }  }
   
Line 190  sub displayallfoils { Line 205  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);
   if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {    if (&Apache::response::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 />".$Apache::response::foilgroup{$name.'.value'};   $result.="<br />".$Apache::response::foilgroup{$name.'.value'};
Line 206  sub displayallfoils { Line 221  sub displayallfoils {
   } else {    } else {
     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 /><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";
  $temp++;   $temp++;
Line 276  sub whichfoils { Line 291  sub whichfoils {
  }   }
     }      }
     #pick a true statement      #pick a true statement
       my $notrue=0;
       if (scalar(@truelist) == 0) { $notrue=1; }
     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;
       my $bottomcount=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+$topcount+$bottomcount) < $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 296  sub whichfoils { Line 313  sub whichfoils {
     $topcount++;      $topcount++;
  } elsif ($bottom{$afalse}) {   } elsif ($bottom{$afalse}) {
     $bottomlist[$bottom{$afalse}]=$afalse;      $bottomlist[$bottom{$afalse}]=$afalse;
       $bottomcount++;
  } else {   } else {
     push (@whichfalse,$afalse);      push (@whichfalse,$afalse);
  }   }
     }      }
       &Apache::lonxml::debug("Answer wants $answer");
     my $truename=$truelist[$whichtrue];      my $truename=$truelist[$whichtrue];
     my $dosplice=1;      my $dosplice=1;
       if ($notrue) {
    $dosplice=0;
    &Apache::lonxml::error("There are no true statements available.<br />");
       }
     #insert the true statement, keeping track of where it wants to be      #insert the true statement, keeping track of where it wants to be
     if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' ) {      if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' && $dosplice) {
  $toplist[$top{$truename}]=$truename;   $toplist[$top{$truename}]=$truename;
  $answer=-1;   $answer=-1;
  foreach my $top (reverse(@toplist)) {   foreach my $top (reverse(@toplist)) {
Line 311  sub whichfoils { Line 334  sub whichfoils {
     if ($top eq $truename) { last; }      if ($top eq $truename) { last; }
  }   }
  $dosplice=0;   $dosplice=0;
     } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom') {      } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom' && $dosplice) {
  $bottomlist[$bottom{$truename}]=$truename;   $bottomlist[$bottom{$truename}]=$truename;
  $answer=-1;   $answer=-1;
  foreach my $bot (@bottomlist) {   foreach my $bot (@bottomlist) {
Line 321  sub whichfoils { Line 344  sub whichfoils {
  $answer+=$topcount+$#whichfalse+1;   $answer+=$topcount+$#whichfalse+1;
  $dosplice=0;   $dosplice=0;
     } else {      } else {
  if ($topcount>0) {    if ($topcount>0 || $bottomcount>0) {
   $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))      $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
     + $topcount;   + $topcount;
  }   }
     }      }
       &Apache::lonxml::debug("Answer now wants $answer");
     #add the top items to the top, bottom items to the bottom      #add the top items to the top, bottom items to the bottom
     for (my $i=0;$i<=$#toplist;$i++) {      for (my $i=0;$i<=$#toplist;$i++) {
  if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) }   if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) }
Line 345  sub displayfoils { Line 369  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') &&
          &Apache::response::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 363  sub displayfoils { Line 391  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 376  sub displayfoils { Line 404  sub displayfoils {
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);      my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
       if ($target ne 'tex') {        if ($target ne 'tex') {
   $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'}.'\\\\';  #' stupid emacs        $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++;
Removed from v.1.58  
changed lines
  Added in v.1.73

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