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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.145 and 1.150

version 1.145, 2010/05/03 14:43:50 version 1.150, 2011/08/26 22:40:17
Line 141  sub start_foilgroup { Line 141  sub start_foilgroup {
     my $result;      my $result;
     %Apache::response::foilgroup=();      %Apache::response::foilgroup=();
     $Apache::radiobuttonresponse::conceptgroup=0;      $Apache::radiobuttonresponse::conceptgroup=0;
     &Apache::response::pushrandomnumber();      &Apache::response::pushrandomnumber(undef,$target);
     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.'}.]';
     }      }
Line 167  sub storesurvey { Line 167  sub storesurvey {
     if ($style eq 'anonsurvey') {      if ($style eq 'anonsurvey') {
         $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';          $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
     } elsif ($style eq 'anonsurveycred') {      } elsif ($style eq 'anonsurveycred') {
         $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CRED';          $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
     } elsif ($style eq 'surveycred') {      } elsif ($style eq 'surveycred') {
         $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';          $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
     } else {      } else {
Line 336  sub displayallfoils { Line 336  sub displayallfoils {
     my $i   =0;      my $i   =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;      my ($lastresponse,$newvariation,$showanswer);
     unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {      if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') ||
           ($Apache::lonhomework::type eq 'randomizetry')) &&
           ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
           if ($env{'form.'.$part.'.rndseed'} ne
               $Apache::lonhomework::history{"resource.$part.rndseed"}) {
               $newvariation = 1;
           }
       }
       $showanswer = &Apache::response::show_answer();
       unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'})) ||
              ($newvariation && !$showanswer)) {
         $lastresponse =           $lastresponse = 
     $Apache::lonhomework::history{"resource.$part.$id.submission"};      $Apache::lonhomework::history{"resource.$part.$id.submission"};
     }      }
     if ($direction eq 'horizontal') { $result.='<table><tr>'; }      if ($direction eq 'horizontal') { $result.='<table><tr>'; }
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);      my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     if (&Apache::response::show_answer() ) {      if ($showanswer) {
  foreach my $name (@names) {   foreach my $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
  if (($direction eq 'horizontal') && ($target ne 'tex')) {   if (($direction eq 'horizontal') && ($target ne 'tex')) {
Line 400  sub displayallfoils { Line 410  sub displayallfoils {
                        type=\"radio\"                         type=\"radio\"
                        name=\"HWVAL_$Apache::inputtags::response['-1']\"                         name=\"HWVAL_$Apache::inputtags::response['-1']\"
                        value=\"$temp\"";                         value=\"$temp\"";
   
     if (defined($lastresponse{$name})) { $result .= ' checked="checked"'; }      if (defined($lastresponse{$name})) { $result .= ' checked="checked"'; }
     $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}.      $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}.
  '</label>';   '</label>';
Line 544  sub whichfoils { Line 555  sub whichfoils {
     $dosplice=0;      $dosplice=0;
  } else {   } else {
     if ($topcount>0 || $bottomcount>0) {      if ($topcount>0 || $bottomcount>0) {
  $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))                  my $inc = 1;
     + $topcount;                  if (($bottomcount > 0) && ($Apache::lonhomework::type ne 'exam')) {
                       $inc = 2;
                   }
                   $answer=int(&Math::Random::random_uniform() * ($#whichfalse+$inc))
                           + $topcount;
     }      }
  }   }
  &Apache::lonxml::debug("Answer now wants $answer");   &Apache::lonxml::debug("Answer now wants $answer");
Line 617  sub displayfoils { Line 632  sub displayfoils {
  my $temp=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,$newvariation);
           if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') ||
                ($Apache::lonhomework::type eq 'randomizetry')) && 
           ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
               if ($env{'form.'.$part.'.rndseed'} ne
                   $Apache::lonhomework::history{"resource.$part.rndseed"}) {
                   $newvariation = 1;
               }
           }
           unless ($newvariation) {
       $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
           }
  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
  if ($target ne 'tex' && $direction eq 'horizontal') {   if ($target ne 'tex' && $direction eq 'horizontal') {
     $result.="<table><tr>";      $result.="<table><tr>";
Line 793  sub end_foil { Line 819  sub end_foil {
  &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));   &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
  $name=$Apache::lonxml::curdepth;   $name=$Apache::lonxml::curdepth;
     }      }
               if ($name eq "0") {
                   &Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.','<b><tt>'.$name.'</tt></b>'));
               }
     if (defined($Apache::response::foilnames{$name})) {      if (defined($Apache::response::foilnames{$name})) {
  &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>'));   &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>'));
     }      }
Removed from v.1.145  
changed lines
  Added in v.1.150

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