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

Diff for /loncom/homework/matchresponse.pm between versions 1.76 and 1.77

version 1.76, 2009/04/16 15:04:58 version 1.77, 2009/11/23 12:05:36
Line 180  sub end_itemgroup { Line 180  sub end_itemgroup {
     $i++;      $i++;
  }   }
  $table.=' \end{description}  \strut ';   $table.=' \end{description}  \strut ';
  if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}   if ($Apache::lonhomework::type eq 'exam')  {$table.='\vskip -13 mm \strut ';}
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
  $Apache::lonxml::post_evaluate=0;   $Apache::lonxml::post_evaluate=0;
     }      }
Line 518  sub displayfoils { Line 518  sub displayfoils {
                         my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';                          my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';
                         $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);                          $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
                     } else {                      } else {
    &Apache::lonnet::logthis("Exam2");
   
                         $optionlist='\framebox[10 mm][s]{\tiny\strut}';                          $optionlist='\framebox[10 mm][s]{\tiny\strut}';
                     }                      }
                 }                  }
Line 573  sub displayfoils { Line 575  sub displayfoils {
     $question.="<br />\n".$text;      $question.="<br />\n".$text;
  }   }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
       &Apache::lonnet::logthis('webbubbles');
     my @blank;      my @blank;
     $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);      $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
  }   }
Line 581  sub displayfoils { Line 584  sub displayfoils {
  # confine the bubbles to righttabsize:   # confine the bubbles to righttabsize:
  #   #
  if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {   if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {
       &Apache::lonnet::logthis('exam3');
     $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 -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'      $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
  .'\item \hskip -3mm \textbf{'.$internal_counter.'}';   .'\item \hskip -3mm \textbf{'.$internal_counter.'}';
     if (&itemdisplay('left') || &itemdisplay('right')) {      if (&itemdisplay('left') || &itemdisplay('right')) {
  $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);   $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
     }      }
     else {      else {
  $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);   $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
     }      }
     $question .= '\end{list} \vskip -8 mm \strut ';      $question .= '\end{list} \vskip -8 mm \strut ';
     $internal_counter++;      $internal_counter++;
         } else {          } else {
       &Apache::lonnet::logthis("Exam4");
                     if($env{'form.pdfFormFields'} eq 'yes'                       if($env{'form.pdfFormFields'} eq 'yes' 
                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {                              && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
                         $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';                          $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';
Line 739  sub end_foil { Line 744  sub end_foil {
     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') {   if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       &Apache::lonnet::logthis('triangleright');
     $text='\vskip 5mm $\triangleright$ '.$text;      $text='\vskip 5mm $\triangleright$ '.$text;
  }   }
  my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);   my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
Line 758  sub end_foil { Line 764  sub end_foil {
      $safeeval);       $safeeval);
     if ( $Apache::matchresponse::conceptgroup      if ( $Apache::matchresponse::conceptgroup
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
    &Apache::lonnet::logthis("pushing conceptgroup");
   
  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;   $Apache::response::conceptgroup{"$name.text"} = $text;
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
     } else {      } else {
    &Apache::lonnet::logthis("pushing foilgroup.");
   
  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;   $Apache::response::foilgroup{"$name.text"} = $text;
Removed from v.1.76  
changed lines
  Added in v.1.77

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