Diff for /loncom/homework/response.pm between versions 1.82 and 1.87

version 1.82, 2003/07/28 22:44:54 version 1.87, 2003/10/27 19:27:09
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 11/23,11/24,11/28 Gerd Kortemeyer  
 # Guy Albertelli  
 # 08/04,08/07 Gerd Kortemeyer  
   
 package Apache::response;  package Apache::response;
 use strict;  use strict;
Line 180  sub mandatory_part_meta { Line 177  sub mandatory_part_meta {
 #  #
 }  }
   
   sub meta_part_order {
       if (@Apache::inputtags::partlist) {
    my @parts=@Apache::inputtags::partlist;
    shift(@parts);
    return '<partorder>'.join(',',@parts).'</partorder>';
       } else {
    return '<partorder>0</partorder>';
       }
   }
   
 sub check_for_previous {  sub check_for_previous {
     my ($curresponse,$partid,$id) = @_;      my ($curresponse,$partid,$id) = @_;
     my %previous;      my %previous;
Line 278  sub end_dataresponse { Line 285  sub end_dataresponse {
     return $result;      return $result;
 }  }
   
   sub decide_package {
       my ($tagstack)=@_;
       my $package;
       if ($$tagstack[-1] eq 'parameter') {
    $package='part';
       } else {
    my $i=-1;
    while (defined($$tagstack[$i])) {
       if ($$tagstack[$i] =~ /(response|hint)$/) {
    $package=$$tagstack[$i];
    last;
       }
       $i--;
    }
       }
       return $package;
   }
   
 sub start_responseparam {  sub start_responseparam {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';      my $result='';
Line 288  sub start_responseparam { Line 313  sub start_responseparam {
  $token->[2]->{'description'});   $token->[2]->{'description'});
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
    my $optionlist;
    my $package=&decide_package($tagstack);
    foreach my $key (sort(keys(%Apache::lonnet::packagetab))) {
       if ($key =~ /^\Q$package\E&(.*)&display$/) {
    $optionlist.='<option value="'.$1.'">'.
       $Apache::lonnet::packagetab{$key}.'</option>';
       }
    }
    if (defined($optionlist)) {
       $result.='Use template: <select name="'.
    &Apache::edit::html_element_name('parameter_package').'">'.
       '<option value=""></option>'.$optionlist.'</select><br />';
    }
  $result.=&Apache::edit::text_arg('Name:','name',$token).   $result.=&Apache::edit::text_arg('Name:','name',$token).
     &Apache::edit::text_arg('Type:','type',$token).      &Apache::edit::text_arg('Type:','type',$token).
  &Apache::edit::text_arg('Description:','description',$token).   &Apache::edit::text_arg('Description:','description',$token).
Line 295  sub start_responseparam { Line 333  sub start_responseparam {
  "</td></tr>";   "</td></tr>";
  $result.=&Apache::edit::end_table;   $result.=&Apache::edit::end_table;
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      'name','type','description',       $safeeval,'name','type',
      'default');       'description','default');
    my $element=&Apache::edit::html_element_name('parameter_package');
    if (defined($ENV{"form.$element"}) && $ENV{"form.$element"} ne '') {
       my $name=$ENV{"form.$element"};
       my $tag=&decide_package($tagstack);
       $token->[2]->{'name'}=$name;
       $token->[2]->{'type'}=
    $Apache::lonnet::packagetab{"$tag&$name&type"};
       $token->[2]->{'description'}=
    $Apache::lonnet::packagetab{"$tag&$name&display"};
       $token->[2]->{'default'}=
    $Apache::lonnet::packagetab{"$tag&$name&default"};
       $constructtag=1;
    }
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
Line 368  sub answer_header { Line 419  sub answer_header {
     my ($type) = @_;      my ($type) = @_;
     my $result;      my $result;
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($ENV{'form.answer_output_mode'} eq 'tex') {
  $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: '.   $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'.
                   $Apache::inputtags::part.' \\\\ \hline ';                    $Apache::inputtags::part.'| \\\\ \hline ';
     } else {      } else {
  $result = '<table border="1"><tr><td>Answer for Part:'.   $result = '<table border="1"><tr><td>Answer for Part:'.
     $Apache::inputtags::part. '</td>'."\n";      $Apache::inputtags::part. '</td>'."\n";
Line 512  sub whichorder { Line 563  sub whichorder {
     return @whichopt;      return @whichopt;
 }  }
   
   sub show_answer {
       my $part   = $Apache::inputtags::part;
       my $award  = $Apache::lonhomework::history{"resource.$part.solved"};
       my $status = $Apache::inputtags::status[-1];
       return  ( ($award =~ /^correct/
          && lc($Apache::lonhomework::problemstatus) ne 'no')
         || $status eq "SHOW_ANSWER");
   }
   
   sub analyze_store_foilgroup {
       my ($shown,$attrs)=@_;
       my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
       foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
    if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
    push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
    foreach my $attr (@$attrs) {
       $Apache::lonhomework::analyze{"$part_id.foil.".$attr.".$name"} =
    $Apache::response::foilgroup{"$name.".$attr};
    }
       }
       push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} }, @{ $shown });
   }
   
   sub pick_foil_for_concept {
       my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_;
       if (not defined(@{ $Apache::response::conceptgroup{'names'} })) { return; }
       my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;
       foreach my $attr (@$attrs) {
    $Apache::response::foilgroup{"$name.".$attr} =
       $Apache::response::conceptgroup{"$name.".$attr};
       }
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");
       my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
       if ($target eq 'analyze') {
    push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
         $concept);
    $Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
       $Apache::response::conceptgroup{'names'};
    foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
       push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
     $name);
       foreach my $attr (@$attrs) {
    $Apache::lonhomework::analyze{"$part_id.foil.$attr.$name"}=
       $Apache::response::conceptgroup{"$name.$attr"};
       }
    }
       }
       push(@{ $hinthash->{"$part_id.concepts"} },$concept);
       $hinthash->{"$part_id.concept.$concept"}=
    $Apache::response::conceptgroup{'names'};
   
   }
   
   
 1;  1;
 __END__  __END__
     

Removed from v.1.82  
changed lines
  Added in v.1.87


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