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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.53 and 1.72

version 1.53, 2002/09/26 21:45:53 version 1.72, 2003/06/20 04:05:13
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 61  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 79  sub end_radiobuttonresponse { Line 90  sub end_radiobuttonresponse {
   
 %Apache::response::foilgroup=();  %Apache::response::foilgroup=();
 sub start_foilgroup {  sub start_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
   %Apache::response::foilgroup=();    %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;    $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   return '';    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
         $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     }
     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 102  sub storesurvey { Line 118  sub storesurvey {
   
 sub grade_response {  sub grade_response {
   my ($max,$randomize)=@_;    my ($max,$randomize)=@_;
     #keep the random numbers the same must always call this
     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'];
   my ($answer,@whichfoils)=&whichfoils($max,$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 152  sub end_foilgroup { Line 174  sub end_foilgroup {
       }        }
     }      }
   }    }
     &Apache::lonxml::increment_counter();
   return $result;    return $result;
 }  }
   
Line 198  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 268  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 288  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 303  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 313  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 337  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') &&
          (($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 355  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 $temp=0;      my @alphabet = ('A'..'Z');
       my $i = 0;
       my $temp=0;  
     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"};
     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";
       } else {        } else {
   $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};    if ($Apache::lonhomework::type eq 'exam') {
         $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
         $i++;
     } else {
         $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
     }
       }        }
       $temp++;        $temp++;
     }      }
Line 424  sub end_conceptgroup { Line 467  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.53  
changed lines
  Added in v.1.72

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