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

Diff for /loncom/homework/matchresponse.pm between versions 1.49 and 1.54

version 1.49, 2005/01/10 19:21:57 version 1.54, 2005/06/21 21:00:55
Line 32  use HTML::Entities(); Line 32  use HTML::Entities();
 use Math::Random();  use Math::Random();
 use Apache::optionresponse();  use Apache::optionresponse();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));      &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
Line 101  sub start_itemgroup { Line 102  sub start_itemgroup {
    'location',     'location',
    ['top','bottom','left','right'],     ['top','bottom','left','right'],
    $token);     $token);
    $result.=&Apache::edit::select_arg('Items Display Directection:',
      'direction',
      ['vertical','horizontal'],
      $token);
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'randomize',       $safeeval,'randomize',
      'location');       'location','direction');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'web' or $target eq 'tex') {      } elsif ($target eq 'web' or $target eq 'tex') {
  $Apache::matchresponse::itemtable{'location'}=   $Apache::matchresponse::itemtable{'location'}=
Line 142  sub end_itemgroup { Line 147  sub end_itemgroup {
     }      }
     $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;
       my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval);
     if ($target eq 'web') {      if ($target eq 'web') {
  my $table='<table>';   my $table='<table>';
  my $i=0;   my $i=0;
    if ($direction eq 'horizontal') { $table .='<tr>';}
  foreach my $name (@names) {   foreach my $name (@names) {
     $table.='<tr><td>'.$alphabet[$i].'</td><td>'.      if ($direction ne 'horizontal') { $table.='<tr>'; }
  $Apache::response::itemgroup{$name.'.text'}.      $table.='<td>'.$alphabet[$i].'</td><td>'.
     '</td></tr>';   $Apache::response::itemgroup{$name.'.text'}.'</td>';
       if ($direction ne 'horizontal') { $table.='</tr>'; }
     $i++;      $i++;
  }   }
    if ($direction eq 'horizontal') { $table .='</tr>';}
  $table.='</table>';   $table.='</table>';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
Line 309  sub grade_response { Line 318  sub grade_response {
    $randomize,     $randomize,
             &Apache::response::showallfoils(),              &Apache::response::showallfoils(),
            \%Apache::response::foilgroup);             \%Apache::response::foilgroup);
     if (!defined($ENV{'form.submitted'})) { return; }      if (!&Apache::response::submitted()) { return; }
     my %responsehash;      my %responsehash;
     my %grade;      my %grade;
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);      my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
Line 429  sub displayfoils { Line 438  sub displayfoils {
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $question.=' \\\\ '.$letter.':'.$text;   $question.=' \\\\ '.$letter.':'.$text;
     } else {      } else {
  $question.='<br />'.$letter.':'.$text;   $question.='<br /><b>'.$letter.':</b> '.$text;
     }      }
  }   }
     } else {      } else {
Line 502  sub displayfoils { Line 511  sub displayfoils {
     $result='<table><tr><td valign="top">'.$question.      $result='<table><tr><td valign="top">'.$question.
  '</td><td valign="top">'.$result.'</td></tr></table>';   '</td><td valign="top">'.$result.'</td></tr></table>';
  } else {   } else {
     my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});      my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
     my ($lefttabsize,$righttabsize)=(0,0);      my ($lefttabsize,$righttabsize)=(0,0);
     if ($Apache::matchresponse::TeXitemgroupwidth ne '') {      if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
  $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;   $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
Line 524  sub displayfoils { Line 533  sub displayfoils {
     $result='<table><tr><td valign="top">'.$result.      $result='<table><tr><td valign="top">'.$result.
  '</td><td valign="top">'.$question.'</td></tr></table>';   '</td><td valign="top">'.$question.'</td></tr></table>';
  } else {   } else {
     my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});      my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
     my ($lefttabsize,$righttabsize)=(0,0);      my ($lefttabsize,$righttabsize)=(0,0);
     if ($Apache::matchresponse::TeXitemgroupwidth ne '') {      if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
  $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;   $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
Line 647  sub end_foil { Line 656  sub end_foil {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     &Apache::lonxml::debug("Got a name of :$name:");      &Apache::lonxml::debug("Got a name of :$name:");
     if (!$name) {      if (!$name) {
  &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");   &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
  $name=$Apache::lonxml::curdepth;   $name=$Apache::lonxml::curdepth;
     }      }
     &Apache::lonxml::debug("Using a name of :$name:");      &Apache::lonxml::debug("Using a name of :$name:");
Removed from v.1.49  
changed lines
  Added in v.1.54

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