Diff for /loncom/homework/optionresponse.pm between versions 1.27 and 1.29

version 1.27, 2001/12/04 15:17:56 version 1.29, 2001/12/14 23:00:52
Line 37  sub BEGIN { Line 37  sub BEGIN {
 sub start_optionresponse {  sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   #when in a radiobutton response use these    #when in a option response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   push (@Apache::lonxml::namespace,'optionresponse');    push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
Line 65  sub end_optionresponse { Line 65  sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;    &Apache::response::end_response;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;    my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   return $result;    return $result;
Line 171  sub end_foilgroup { Line 172  sub end_foilgroup {
   }    }
   $temp++;    $temp++;
  }   }
    my $part=$Apache::inputtags::part;
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
    my %previous=&Apache::response::check_for_previous($responsestr,
      $part,$id);
  &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");   &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
    my $ad;
  if ($wrong==0 && $ignored==0) {   if ($wrong==0 && $ignored==0) {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';    $ad='EXACT_ANS';
    } elsif ($wrong==0 && $right==0) {
     #nothing submitted
  } else {   } else {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';    $ad='INCORRECT';
  }   }
    $Apache::lonhomework::results{"resource.$part.$id.submission"}=
     $responsestr;
    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
     $ad;
    &Apache::response::handle_previous(\%previous,$ad);
       }        }
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
Line 231  sub displayfoils { Line 243  sub displayfoils {
   my $result;    my $result;
   my $name;    my $name;
   my @whichopt = &whichfoils($max);    my @whichopt = &whichfoils($max);
   my $optionlist="<option></option>\n";    my $part=$Apache::inputtags::part;
   my $option;    my $id=$Apache::inputtags::response[-1];
   foreach $option (@opt) {    if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     $optionlist.="<option>$option</option>\n";  
   }  
   if (($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {  
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
       $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.        $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
  ":".$Apache::response::foilgroup{$name.'.text'}."\n";   ":".$Apache::response::foilgroup{$name.'.text'}."\n";
     }      }
   } else {    } else {
     my $temp=1;      my $temp=1;
       my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
         my $lastopt=$lastresponse{$name};
         my $optionlist="<option></option>\n";
         my $option;
         foreach $option (@opt) {
    if ($option eq $lastopt) {
     $optionlist.="<option selected=\"on\">$option</option>\n";
    } else {
     $optionlist.="<option>$option</option>\n";
    }
         }
       $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"        $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
  .$optionlist   .$optionlist
   ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";    ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";

Removed from v.1.27  
changed lines
  Added in v.1.29


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