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

Diff for /loncom/homework/matchresponse.pm between versions 1.5 and 1.6

version 1.5, 2003/03/17 19:54:20 version 1.6, 2003/03/18 21:26:33
Line 31  package Apache::matchresponse; Line 31  package Apache::matchresponse;
 use strict;  use strict;
 use HTML::Entities();  use HTML::Entities();
 use Math::Random();  use Math::Random();
   use Apache::optionresponse;
   
   my @Items;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));      &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
Line 125  sub end_itemgroup { Line 128  sub end_itemgroup {
     foreach my $name (@names) {      foreach my $name (@names) {
  $letter_name_map{$alphabet[$i]}=$name;   $letter_name_map{$alphabet[$i]}=$name;
  $name_letter_map{$name}=$alphabet[$i];   $name_letter_map{$name}=$alphabet[$i];
    push @Items, $alphabet[$i];
  $i++;   $i++;
     }      }
     $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;       $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;      $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     if ($target eq 'web') {      if ($target eq 'web') {
  my $table='<table>';   my $table='<table>';
Line 380  sub displayfoils { Line 384  sub displayfoils {
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
  my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
  my $localcount = 1;  
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $lastopt=$lastresponse{$name};      my $lastopt=$lastresponse{$name};
     my $last_letter=$name_letter_map{$lastopt};      my $last_letter=$name_letter_map{$lastopt};
     my $optionlist = '';      my $optionlist = '';
     if ($target ne 'tex') {$optionlist="<option></option>\n";} else {$optionlist=' '.$localcount.'. '; $localcount++;}      if ($target ne 'tex') {$optionlist="<option></option>\n";} 
          else {$optionlist='\framebox[5 mm][s]{\tiny\strut}';}
     my $option;      my $option;
     foreach $option (sort(keys(%letter_name_map))) {      foreach $option (sort(keys(%letter_name_map))) {
  if ($option eq $last_letter) {   if ($option eq $last_letter) {
     if ($target ne 'tex') {      if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
  $optionlist.="<option selected=\"on\">$option</option>\n";  
     }  
  } else {   } else {
     if ($target ne 'tex') {      if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
  $optionlist.="<option>$option</option>\n";  
     }  
  }   }
     }      }
     if ($target ne 'tex') {      if ($target ne 'tex') {
Line 408  sub displayfoils { Line 408  sub displayfoils {
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $question.='<br />'.$optionlist.$text."\n";   $question.='<br />'.$optionlist.$text."\n";
     } else {   if ($Apache::lonhomework::type eq 'exam') {
  $question.=' \\\\ '.$optionlist.$text."\n";      $question.=&Apache::optionresponse::webbubbles(\@Items,\@Items);
    }
       } else {
    if ($Apache::lonhomework::type eq 'exam') {
       $question.=' '.$optionlist.$text."\n";
       $question.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate}\strut ';
       &Apache::lonxml::increment_counter();
           } else {
       $question.=' \\\\ '.$optionlist.$text."\n";
    }
             }               } 
     $temp++;      $temp++;
  }   }
Removed from v.1.5  
changed lines
  Added in v.1.6

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