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

Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.143 and 1.144

version 1.143, 2009/05/23 05:04:58 version 1.144, 2010/02/28 23:42:24
Line 146  sub start_foilgroup { Line 146  sub start_foilgroup {
 }  }
   
 sub storesurvey {  sub storesurvey {
       my ($style) = @_;
     if ( !&Apache::response::submitted() ) { return ''; }      if ( !&Apache::response::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:");
Line 159  sub storesurvey { Line 160  sub storesurvey {
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
  $responsestr;   $responsestr;
     my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);      my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
     my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';      my $ad;
       if ($style eq 'anonsurvey') {
           $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
       } elsif ($style eq 'anonsurveycred') {
           $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CRED';
       } elsif ($style eq 'surveycred') {
           $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
       } else {
           $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
       }
     &Apache::response::handle_previous(\%previous,$ad);      &Apache::response::handle_previous(\%previous,$ad);
     &Apache::lonxml::debug("submitted a $response<br />\n");      &Apache::lonxml::debug("submitted a $response<br />\n");
     return '';      return '';
Line 224  sub end_foilgroup { Line 234  sub end_foilgroup {
  my $style = $Apache::lonhomework::type;   my $style = $Apache::lonhomework::type;
  my $direction = &Apache::lonxml::get_param('direction',$parstack,   my $direction = &Apache::lonxml::get_param('direction',$parstack,
    $safeeval,'-2');     $safeeval,'-2');
  if ( $style eq 'survey'  && $target ne 'analyze') {   if ( (($style eq 'survey') || ($style eq 'surveycred') || 
                 ($style eq 'anonsurvey') || ($style eq 'anonsurveycred')) 
                && ($target ne 'analyze')) {
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $result=&displayallfoils($direction, $target);   $result=&displayallfoils($direction, $target);
     } elsif ( $target eq 'answer' ) {      } elsif ( $target eq 'answer' ) {
  $result=&displayallanswers();   $result=&displayallanswers();
     } elsif ( $target eq 'grade' ) {      } elsif ( $target eq 'grade' ) {
  $result=&storesurvey();   $result=&storesurvey($style);
     }      }
     $answer_count = scalar(@{$Apache::response::foilgroup{'names'}});      $answer_count = scalar(@{$Apache::response::foilgroup{'names'}});
   
Line 321  sub displayallfoils { Line 333  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;
  $Apache::lonhomework::history{"resource.$part.$id.submission"};      unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
           $lastresponse = 
       $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 (&Apache::response::show_answer() ) {
Line 439  sub whichfoils { Line 454  sub whichfoils {
  &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));   &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
     }      }
  }   }
  if (!$havetrue && $Apache::lonhomework::type ne 'survey') {   if ((!$havetrue) && 
               ($Apache::lonhomework::type ne 'survey') && 
               ($Apache::lonhomework::type ne 'surveycred') &&
               ($Apache::lonhomework::type ne 'anonsurvey') &&
               ($Apache::lonhomework::type ne 'anonsurveycred')) {
     &Apache::lonxml::error(&mt('There are no true statements available.').'<br />');      &Apache::lonxml::error(&mt('There are no true statements available.').'<br />');
  }   }
     } else {      } else {
Line 499  sub whichfoils { Line 518  sub whichfoils {
  &Apache::lonxml::debug("Answer wants $answer");   &Apache::lonxml::debug("Answer wants $answer");
  my $truename=$truelist[$whichtrue];   my $truename=$truelist[$whichtrue];
  my $dosplice=1;   my $dosplice=1;
  if ($notrue && $Apache::lonhomework::type ne 'survey') {   if (($notrue) && 
               ($Apache::lonhomework::type ne 'survey') &&
               ($Apache::lonhomework::type ne 'surveycred') &&
               ($Apache::lonhomework::type ne 'anonsurvey') &&
               ($Apache::lonhomework::type ne 'anonsurveycred')) {
     $dosplice=0;      $dosplice=0;
     &Apache::lonxml::error(&mt('There are no true statements available.').'<br />');      &Apache::lonxml::error(&mt('There are no true statements available.').'<br />');
  }   }
Removed from v.1.143  
changed lines
  Added in v.1.144

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