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

Diff for /loncom/homework/matchresponse.pm between versions 1.41 and 1.53

version 1.41, 2004/05/27 04:32:19 version 1.53, 2005/06/20 21:31:07
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'}=
     &Apache::lonxml::get_param('location',$parstack,$safeeval);      &Apache::lonxml::get_param('location',$parstack,$safeeval);
    $Apache::matchresponse::TeXitemgroupwidth=&Apache::lonxml::get_param('TeXitemgroupwidth',$parstack,$safeeval,undef,0);
     }      }
     return $result;      return $result;
 }  }
Line 141  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 308  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 349  sub grade_response { Line 359  sub grade_response {
  $itemstr;   $itemstr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=      $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
  $gradestr;   $gradestr;
     if (!$Apache::lonhomework::scantronmode) {      if ($Apache::lonhomework::type eq 'survey') {
    if ($ignored == 0) {
       my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
       &Apache::response::handle_previous(\%previous,$ad);
    } elsif ($wrong==0 && $right==0) {
    } else {
       my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
       &Apache::response::handle_previous(\%previous,$ad);
    }
       } elsif (!$Apache::lonhomework::scantronmode) {
  my $ad;   my $ad;
  if ($wrong==0 && $ignored==0) {   if ($wrong==0 && $ignored==0) {
     $ad='EXACT_ANS';      $ad='EXACT_ANS';
Line 419  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 459  sub displayfoils { Line 478  sub displayfoils {
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     if ($target ne 'tex') {      if ($target ne 'tex') {
  if ($Apache::lonhomework::type ne 'exam') {   if ($Apache::lonhomework::type ne 'exam') {
     $question.='<br />'.$optionlist.$text."\n";      $question.="<br />\n".$optionlist.$text;
  } else {   } else {
     $question.='<br />'.$text."\n";      $question.="<br />\n".$text;
  }   }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter);      my @blank;
       $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
  }   }
     } else {      } else {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
Line 486  sub displayfoils { Line 506  sub displayfoils {
  $result=$question.$result;   $result=$question.$result;
     } elsif ($result=&itemdisplay('right')) {      } elsif ($result=&itemdisplay('right')) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
     $result='<table><tr><td>'.$question.'</td><td>'.$result.      #remove the first <br />
  '</td></tr></table>';      $question=~s|<br />||;
       $result='<table><tr><td valign="top">'.$question.
    '</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'});
     $tabsize=~/(\d+\.?\d*)/;      my ($lefttabsize,$righttabsize)=(0,0);
     $tabsize=$1/2.1;      if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
     $tabsize.=' mm ';   $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
     $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}\end{tabular}';   $lefttabsize=$tabsize*$1/100;
    $righttabsize=0.95*($tabsize-$lefttabsize);
       } else {
    $tabsize=~/(\d+\.?\d*)/;
    $lefttabsize=$1/2.1;
    $righttabsize=0.95*($1-$lefttabsize);
       }
       $lefttabsize.=' mm ';
       $righttabsize.=' mm ';
       $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
  }   }
     } elsif ($result=&itemdisplay('left')) {      } elsif ($result=&itemdisplay('left')) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
     $result='<table><tr><td>'.$result.'</td><td>'.$question.      #remove the first <br />
  '</td></tr></table>';      $question=~s|<br />||;
       $result='<table><tr><td valign="top">'.$result.
    '</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'});
     $tabsize=~/(\d+\.?\d*)/;      my ($lefttabsize,$righttabsize)=(0,0);
     $tabsize=$1/2.1;      if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
     $tabsize.=' mm ';   $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
     $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}\end{tabular}';   $lefttabsize=$tabsize*$1/100;
    $righttabsize=0.95*($tabsize-$lefttabsize);
       } else {
    $tabsize=~/(\d+\.?\d*)/;
    $lefttabsize=$1/2.1;
    $righttabsize=0.95*($1-$lefttabsize);
       }
       $lefttabsize.=' mm ';
       $righttabsize.=' mm ';
       $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
  }   }
     }      }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}      if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
Line 567  sub start_foil { Line 609  sub start_foil {
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
    if ($target eq 'analyze') {
       &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
    }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token,"Foil");   $result=&Apache::edit::tag_start($target,$token,"Foil");
  my $level='-2';   my $level='-2';
Line 600  sub end_foil { Line 645  sub end_foil {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  $text=&Apache::lonxml::endredirection;   $text=&Apache::lonxml::endredirection;
     }      }
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       $text='\vskip 5mm $\triangleright$ '.$text;
    }
  my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);   my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
  if ($value ne 'unused') {   if ($value ne 'unused') {
     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) { $name=$Apache::lonxml::curdepth; }      if (!$name) {
    &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
    $name=$Apache::lonxml::curdepth;
       }
     &Apache::lonxml::debug("Using a name of :$name:");      &Apache::lonxml::debug("Using a name of :$name:");
     if (defined($Apache::response::foilnames{$name})) {      if (defined($Apache::response::foilnames{$name})) {
  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));   &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
Line 618  sub end_foil { Line 670  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;
  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {   $Apache::response::conceptgroup{"$name.text"} = $text;
     $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;
  if ($Apache::lonhomework::type eq 'exam') {   $Apache::response::foilgroup{"$name.text"} = $text;
     if ($target eq 'tex') {  
  $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;  
     } else {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     }  
  } else {  
     if ($target eq 'tex') {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     } else {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     }  
  }  
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
     }      }
  }   }
Removed from v.1.41  
changed lines
  Added in v.1.53

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