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

Diff for /loncom/homework/matchresponse.pm between versions 1.35 and 1.55

version 1.35, 2004/02/09 19:47:53 version 1.55, 2005/06/22 12:03:23
Line 30  package Apache::matchresponse; Line 30  package Apache::matchresponse;
 use strict;  use strict;
 use HTML::Entities();  use HTML::Entities();
 use Math::Random();  use Math::Random();
 use Apache::optionresponse;  use Apache::optionresponse();
   use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));      &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
Line 46  sub start_matchresponse { Line 48  sub start_matchresponse {
     push (@Apache::lonxml::namespace,'matchresponse');      push (@Apache::lonxml::namespace,'matchresponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     %Apache::hint::match=();      %Apache::hint::match=();
       undef(%Apache::response::foilnames);
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $result=&Apache::response::meta_package_write('matchresponse');   $result=&Apache::response::meta_package_write('matchresponse');
     } elsif ($target eq 'edit' ) {      } elsif ($target eq 'edit' ) {
Line 80  sub end_matchresponse { Line 83  sub end_matchresponse {
     pop @Apache::lonxml::namespace;      pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::matchresponse',      &Apache::lonxml::deregister('Apache::matchresponse',
  ('foilgroup','foil','conceptgroup'));   ('foilgroup','foil','conceptgroup'));
       undef(%Apache::response::foilnames);
     return $result;      return $result;
 }  }
   
Line 98  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 138  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') {
  my $table=' \begin{description} ';   my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
  my $i=0;   my $i=0;
  foreach my $name (@names) {   foreach my $name (@names) {
     $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;      $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
Line 158  sub end_itemgroup { Line 171  sub end_itemgroup {
  $Apache::response::itemgroup{$name.'.text'};   $Apache::response::itemgroup{$name.'.text'};
     $i++;      $i++;
  }   }
  $table.=' \end{description} \strut ';   $table.=' \end{description}  \strut ';
    if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     }      }
     return $result;      return $result;
Line 202  sub end_item { Line 216  sub end_item {
  my $location=&Apache::lonxml::get_param('location',$parstack,   my $location=&Apache::lonxml::get_param('location',$parstack,
  $safeeval);   $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 eq "") { $name=$Apache::lonxml::curdepth; }
  &Apache::lonxml::debug("Using a name of :$name:");   &Apache::lonxml::debug("Using a name of :$name:");
  push @{ $Apache::response::itemgroup{'names'} }, $name;   push @{ $Apache::response::itemgroup{'names'} }, $name;
  $Apache::response::itemgroup{"$name.text"} = $text;   $Apache::response::itemgroup{"$name.text"} = $text;
Line 228  sub start_foilgroup { Line 242  sub start_foilgroup {
     my $result;      my $result;
     %Apache::response::foilgroup=();      %Apache::response::foilgroup=();
     $Apache::matchresponse::conceptgroup=0;      $Apache::matchresponse::conceptgroup=0;
     &Apache::response::setrandomnumber();      &Apache::response::pushrandomnumber();
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result.=&Apache::edit::start_table($token)   $result.=&Apache::edit::start_table($token)
     ."<tr><td>Collection Of Foils</td><td>Delete:"      ."<tr><td>Collection Of Foils</td><td>Delete:"
Line 262  sub end_foilgroup { Line 276  sub end_foilgroup {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
       &Apache::response::poprandomnumber();
     return $result;      return $result;
 }  }
   
Line 303  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 344  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 414  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 {
  my $i = 0;   my $i = 0;
  my $temp=0;   my $temp=1;
  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"};
Line 454  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') {
     $question.=' '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text."\n";
     my @emptyItems = ();      my @emptyItems = ();
     for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}      for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
     $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';      $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
     $internal_counter++;      $internal_counter++;
         } else {          } else {
     $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";      $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
Line 481  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 {
     $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}';      my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
       my ($lefttabsize,$righttabsize)=(0,0);
       if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
    $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
    $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 {
     $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}';      my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
       my ($lefttabsize,$righttabsize)=(0,0);
       if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
    $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
    $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 554  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 587  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);
     my $location =&Apache::lonxml::get_param('location',$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::warning("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})) {
    &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
       }
       $Apache::response::foilnames{$name}++;
       my $location =&Apache::lonxml::get_param('location',$parstack,
        $safeeval);
     if ( $Apache::matchresponse::conceptgroup      if ( $Apache::matchresponse::conceptgroup
  && !&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.35  
changed lines
  Added in v.1.55

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