Diff for /loncom/homework/optionresponse.pm between versions 1.188 and 1.190

version 1.188, 2012/11/30 11:45:50 version 1.190, 2013/04/30 03:03:34
Line 499  sub check_for_invalid { Line 499  sub check_for_invalid {
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,    my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
       $tex_option_switch, $no_tfprompt, @opt)=@_;        $tex_option_switch, $no_tfprompt, @opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}    my @names; 
   my @names = @{ $Apache::response::foilgroup{'names'} };    if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
         @names = @{ $Apache::response::foilgroup{'names'} };
     }
     unless (@names > 0) { return;}
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
   my $result;      my $result;  
Line 520  sub displayfoils { Line 523  sub displayfoils {
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
  my $text=$Apache::response::foilgroup{$name.'.text'};   my $text=$Apache::response::foilgroup{$name.'.text'};
         my $lastresp;          my $lastresp;
         unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {          if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
               (($env{'form.grade_username'} eq $env{'user.name'}) &&
                ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
             $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};              $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
           } else {
               unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
                       ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
                   $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
               }
         }          }
  my %lastresponse=&Apache::lonnet::str2hash($lastresp);   my %lastresponse=&Apache::lonnet::str2hash($lastresp);
  my $lastopt=$lastresponse{$name};   my $lastopt=$lastresponse{$name};
Line 560  sub displayfoils { Line 570  sub displayfoils {
         }          }
     }      }
     unless ($newvariation) {      unless ($newvariation) {
         %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});          if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
               (($env{'form.grade_username'} eq $env{'user.name'}) &&
                ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
                    %lastresponse =
                        &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
           } else {
               unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
                       ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
                   %lastresponse =
                       &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
               }
           }
     }      }
     my $internal_counter=$Apache::lonxml::counter;      my $internal_counter=$Apache::lonxml::counter;
     my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);      my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);

Removed from v.1.188  
changed lines
  Added in v.1.190


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