[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.17

version 1.5, 2003/03/17 19:54:20 version 1.17, 2003/05/06 22:08:28
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;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));      &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
Line 86  sub start_itemgroup { Line 87  sub start_itemgroup {
     my $result;      my $result;
     %Apache::response::itemgroup=();      %Apache::response::itemgroup=();
     %Apache::matchresponse::itemtable=();      %Apache::matchresponse::itemtable=();
   
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token);   $result=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::select_arg('Randomize Order:','randomize',   $result.=&Apache::edit::select_arg('Randomize Order:','randomize',
Line 111  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);
Line 144  sub end_itemgroup { Line 147  sub end_itemgroup {
  my $table=' \\\\\\\\ \begin{tabular}{ll} ';   my $table=' \\\\\\\\ \begin{tabular}{ll} ';
  my $i=0;   my $i=0;
  foreach my $name (@names) {   foreach my $name (@names) {
       $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
     $table.=' '.$alphabet[$i].' & '.      $table.=' '.$alphabet[$i].' & '.
  $Apache::response::itemgroup{$name.'.text'}.   $Apache::response::itemgroup{$name.'.text'}.
     ' \\\\ ';      ' \\\\ ';
Line 151  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 379  sub displayfoils { Line 383  sub displayfoils {
  my $id=$Apache::inputtags::response[-1];   my $id=$Apache::inputtags::response[-1];
  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;   my @alphabet=('A'..'Z');
    my @used_letters=sort(keys(%letter_name_map));
  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 {
    if ($Apache::lonhomework::type ne 'exam') {
       $optionlist='\framebox[5 mm][s]{\tiny\strut}';
    }
       }
     my $option;      my $option;
     foreach $option (sort(keys(%letter_name_map))) {      foreach $option (@used_letters) {
  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') {
         $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') {
  $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(\@used_letters,\@used_letters);
    }
       } else {
    if ($Apache::lonhomework::type eq 'exam') {
       $question.=' '.$optionlist.$text."\n";
       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 {
       $question.=' \\\\ '.$optionlist.$text."\n";
    }
             }               } 
     $temp++;      $temp++;
  }   }
Line 595  sub end_foil { Line 610  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.5  
changed lines
  Added in v.1.17

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