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

Diff for /loncom/homework/matchresponse.pm between versions 1.12 and 1.18

version 1.12, 2003/03/20 19:38:41 version 1.18, 2003/05/16 20:16:18
Line 113  sub end_itemgroup { Line 113  sub end_itemgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
   
       if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }      if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }
     my @names=@{ $Apache::response::itemgroup{'names'} };      my @names=@{ $Apache::response::itemgroup{'names'} };
     my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);      my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
     if ($randomize ne 'no' ) {      if ($randomize ne 'no' ) {
  @names=&whichorder($#names+1,$randomize,0,   @names=&Apache::response::whichorder($#names+1,$randomize,0,
    \%Apache::response::itemgroup)   \%Apache::response::itemgroup);
     }      }
     my %letter_name_map;      my %letter_name_map;
     my %name_letter_map;      my %name_letter_map;
Line 154  sub end_itemgroup { Line 155  sub end_itemgroup {
  }   }
  $table.=' \end{tabular} \\\\ ';   $table.=' \end{tabular} \\\\ ';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }      }
     return $result;      return $result;
 }  }
   
Line 257  sub displayanswers { Line 258  sub displayanswers {
     my ($max,$randomize,@opt)=@_;      my ($max,$randomize,@opt)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }      if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichfoils = &whichorder(&getfoilcounts($max),$randomize,      my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max),
  &Apache::response::showallfoils(),     $randomize,
  \%Apache::response::foilgroup);    &Apache::response::showallfoils(),
    \%Apache::response::foilgroup);
     my $result=&Apache::response::answer_header('matchresponse');      my $result=&Apache::response::answer_header('matchresponse');
     my %name_letter_map;      my %name_letter_map;
     if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {      if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
Line 278  sub displayanswers { Line 280  sub displayanswers {
   
 sub grade_response {  sub grade_response {
     my ($max,$randomize)=@_;      my ($max,$randomize)=@_;
     my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,      my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
  &Apache::response::showallfoils(),     $randomize,
  \%Apache::response::foilgroup);              &Apache::response::showallfoils(),
              \%Apache::response::foilgroup);
     if (!defined($ENV{'form.submitted'})) { return; }      if (!defined($ENV{'form.submitted'})) { return; }
     my %responsehash;      my %responsehash;
     my %grade;      my %grade;
Line 349  sub displayfoils { Line 352  sub displayfoils {
     my ($target,$max,$randomize)=@_;      my ($target,$max,$randomize)=@_;
     my $result;      my $result;
     my $question;      my $question;
     my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,      my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
  &Apache::response::showallfoils(),     $randomize,
  \%Apache::response::foilgroup);              &Apache::response::showallfoils(),
              \%Apache::response::foilgroup);
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};      my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];      my $status=$Apache::inputtags::status[-1];
Line 394  sub displayfoils { Line 398  sub displayfoils {
     } else {      } else {
  if ($Apache::lonhomework::type ne 'exam') {   if ($Apache::lonhomework::type ne 'exam') {
     $optionlist='\framebox[5 mm][s]{\tiny\strut}';      $optionlist='\framebox[5 mm][s]{\tiny\strut}';
  } else {  
     $optionlist='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';  
  }   }
     }      }
     my $option;      my $option;
Line 410  sub displayfoils { Line 412  sub displayfoils {
         $optionlist='<select name="HWVAL_'.          $optionlist='<select name="HWVAL_'.
     $Apache::inputtags::response[-1].':'.$temp.'">'.      $Apache::inputtags::response[-1].':'.$temp.'">'.
         $optionlist."</select>\n";          $optionlist."</select>\n";
     } else {  
  $optionlist=$optionlist;  
     }      }
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     if ($target ne 'tex') {      if ($target ne 'tex') {
Line 422  sub displayfoils { Line 422  sub displayfoils {
     } else {      } else {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $question.=' '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text."\n";
     $question.=&Apache::optionresponse::bubbles(\@used_letters,\@used_letters).'\end{enumerate} \vskip -7 mm \strut ';      my @emptyItems = ();
       for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
       $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
         } else {          } else {
     $question.=' \\\\ '.$optionlist.$text."\n";      $question.=' \\\\ '.$optionlist.$text."\n";
  }   }
Line 455  sub getfoilcounts { Line 457  sub getfoilcounts {
     return $count;      return $count;
 }  }
   
 sub whichorder {  
     my ($max,$randomize,$showall,$hash)=@_;  
     #&Apache::lonxml::debug("man $max randomize $randomize");  
     if (!defined(@{ $$hash{'names'} })) { return; }  
     my @names = @{ $$hash{'names'} };  
     my @whichopt =();  
     my (%top,@toplist,%bottom,@bottomlist);  
     if (!($showall || ($randomize eq 'no'))) {  
  my $current=0;  
  foreach my $name (@names) {  
     $current++;  
     if ($$hash{"$name.location"} eq 'top') {  
  $top{$name}=$current;  
     } elsif ($$hash{"$name.location"} eq 'bottom') {  
  $bottom{$name}=$current;  
     }  
  }  
     }  
     while ((($#whichopt+1) < $max) && ($#names > -1)) {  
  #&Apache::lonxml::debug("Have $#whichopt max is $max");  
  my $aopt;  
  if ($showall || ($randomize eq 'no')) {  
     $aopt=0;  
  } else {  
     $aopt=int(&Math::Random::random_uniform() * ($#names+1));  
  }  
  #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");  
  $aopt=splice(@names,$aopt,1);  
  #&Apache::lonxml::debug("Picked $aopt");  
  if ($top{$aopt}) {  
     $toplist[$top{$aopt}]=$aopt;  
  } elsif ($bottom{$aopt}) {  
     $bottomlist[$bottom{$aopt}]=$aopt;  
  } else {  
     push (@whichopt,$aopt);  
  }  
     }  
     for (my $i=0;$i<=$#toplist;$i++) {  
  if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }  
     }  
     for (my $i=0;$i<=$#bottomlist;$i++) {  
  if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }  
     }  
   
     return @whichopt;  
 }  
   
 sub start_conceptgroup {  sub start_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
Line 611  sub end_foil { Line 567  sub end_foil {
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  $Apache::response::conceptgroup{"$name.text"} = $text;   if ($target eq 'tex') {
       $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
    } else {
       $Apache::response::conceptgroup{"$name.text"} = $text;
    }
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
     } else {      } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  $Apache::response::foilgroup{"$name.text"} = $text;   if ($Apache::lonhomework::type eq 'exam') {
       $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
    } else {
       if ($target eq 'tex') {
    $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
       } else {
    $Apache::response::foilgroup{"$name.text"} = $text;
       }
    }
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
     }      }
  }   }
Removed from v.1.12  
changed lines
  Added in v.1.18

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