Diff for /loncom/homework/optionresponse.pm between versions 1.111 and 1.164

version 1.111, 2004/07/02 08:21:39 version 1.164, 2010/04/27 14:11:17
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   
   
   
   
 package Apache::optionresponse;  package Apache::optionresponse;
 use strict;  use strict;
 use Apache::response();  use Apache::response();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));    &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
Line 38  sub start_optionresponse { Line 44  sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   #when in a option response use these    #when in a option response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   push (@Apache::lonxml::namespace,'optionresponse');    push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   %Apache::hint::option=();    %Apache::hint::option=();
   undef(%Apache::response::foilnames);    undef(%Apache::response::foilnames);
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).      $result.=&Apache::edit::start_table($token)
  "<tr><td>Multiple Option Response Question ".         .'<tr><td><span class="LC_nobreak">'.&mt('Multiple Option Response Question').'</span> '
  &Apache::loncommon::help_open_topic('Option_Response_Problems')."</td><td>Delete:".         .&Apache::loncommon::help_open_topic('Option_Response_Problems')."</td>"
  &Apache::edit::deletelist($target,$token)         .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
  ."</td><td>&nbsp;".         .&Apache::edit::deletelist($target,$token)
         &Apache::edit::end_row().         .'</span></td>'
         &Apache::edit::start_spanning_row().         ."<td>&nbsp;"
         "\n";         .&Apache::edit::end_row()
          .&Apache::edit::start_spanning_row()
          ."\n";
     $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',      $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
      $token,'4').       $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order','randomize',          &Apache::edit::select_arg('Randomize Foil Order:','randomize',
   ['yes','no'],$token).    ['yes','no'],$token).
         &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',          &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
   [['horizontal',&mt('Normal list')],    [['horizontal','Normal list'],
    ['vertical',&mt('Listed in a vertical column')]],$token).     ['vertical','Listed in a vertical column']],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();          &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,
Line 69  sub start_optionresponse { Line 77  sub start_optionresponse {
     $result=&Apache::response::meta_package_write('optionresponse');      $result=&Apache::response::meta_package_write('optionresponse');
   } elsif ($target eq 'analyze') {    } elsif ($target eq 'analyze') {
     my $part_id="$Apache::inputtags::part.$id";      my $part_id="$Apache::inputtags::part.$id";
       $Apache::lonhomework::analyze{"$part_id.type"} = 'optionresponse';
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
       push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
   
   }    }
   return $result;    return $result;
 }  }
Line 78  sub end_optionresponse { Line 89  sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;    &Apache::response::end_response;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   my $result;    my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   undef(%Apache::response::foilnames);    undef(%Apache::response::foilnames);
Line 112  sub start_foilgroup { Line 123  sub start_foilgroup {
         </td>          </td>
         <td>Delete an Option:          <td>Delete an Option:
   <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>    <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
           </td>
 ENDTABLE  ENDTABLE
       $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',
    [ ['nochoice','Don\'t show option list'] ]
    ,$token).'</td>';
       $result.= '<td><label>'.&mt('Two-option checkboxes for:').
                 '<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">';
       foreach $option (('',@opt)) {
          $result.='<option value="'.$option.'"';
          if ($option eq &Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval)) {
             $result.=' selected="selected"';
          }
          $result.='>'.$option.'</option>';
       }
       $result.='</select></label>';  
     $result.= &Apache::edit::end_row();      $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();      $result.= &Apache::edit::start_spanning_row();
     $result.= $insertlist.'<br />';      $result.= $insertlist.'<br />';
Line 121  ENDTABLE Line 146  ENDTABLE
     my @options;      my @options;
     my $optchanged=0;      my $optchanged=0;
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {      if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
       my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};        my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
       &Apache::lonxml::debug("Deleting :$delopt:");        &Apache::lonxml::debug("Deleting :$delopt:");
       splice(@options,$delopt-1,1);        splice(@options,$delopt-1,1);
       $optchanged=1;        $optchanged=1;
     }      }
     if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {      if ($env{"form.$Apache::lonxml::curdepth.options"}) {
       my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};        my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
       if ($options[0]) {        if ($options[0]) {
  push(@options,$newopt);   push(@options,$newopt);
       } else {        } else {
Line 136  ENDTABLE Line 161  ENDTABLE
       }        }
       $optchanged=1;        $optchanged=1;
     }      }
     if ($optchanged) {      my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
    'texoptions','checkboxvalue');
       if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";        $result = "<foilgroup options=\"(";
       foreach my $option (@options) {        foreach my $option (@options) {
  $option=~s/\'/\\\'/g;   $option=~s/\'/\\\'/g;
Line 144  ENDTABLE Line 171  ENDTABLE
  $result .="'".$option."',";   $result .="'".$option."',";
       }        }
       chop $result;        chop $result;
       $result.=')">';        $result.=')" ';
         $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
         $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
         $result .= '>';
     } # else nothing changed so just use the default mechanism      } # else nothing changed so just use the default mechanism
   }    }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {    if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       if($env{'form.pdfFormFields'} ne 'yes') {
       $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}        $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
                    \begin{enumerate} ';                     \begin{enumerate} ';
       } else {
         $result .= "\\\\";
       }
   }    }
   return $result;    return $result;
 }  }
Line 164  sub end_foilgroup { Line 198  sub end_foilgroup {
     my $name;      my $name;
     my @opt;      my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
       &Apache::lonxml::debug("options:".join(':',@opt));
   
     my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,      my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
      -2,0);       -2,0);
       my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}      if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");      &Apache::lonxml::debug("Options are $#opt");
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');      my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
        $safeeval,'-2');         $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
       $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);        $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,@opt);
         $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {      } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);        $result.=&displayanswers($max,$randomize,@opt);
         
     } elsif ( $target eq 'analyze') {      } elsif ( $target eq 'analyze') {
  my @shown = &whichfoils($max,$randomize);   my @shown = &whichfoils($max,$randomize);
  &Apache::response::analyze_store_foilgroup(\@shown,   &Apache::response::analyze_store_foilgroup(\@shown,
Line 182  sub end_foilgroup { Line 221  sub end_foilgroup {
  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";   my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
  push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);   push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {        if ( &Apache::response::submitted()) {
  my @whichopt = &whichfoils($max,$randomize);   my @whichopt = &whichfoils($max,$randomize);
  my $temp=1;my $name;   my $temp=1;my $name;
  my %responsehash;   my %responsehash;
Line 192  sub end_foilgroup { Line 231  sub end_foilgroup {
  my $ignored=0;   my $ignored=0;
  foreach $name (@whichopt) {   foreach $name (@whichopt) {
   my $response=&Apache::response::getresponse($temp);    my $response=&Apache::response::getresponse($temp);
   if ($ENV{'form.submitted'} eq 'scantron') {    if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) {
       $response = $opt[$response];        $response = $opt[$response];
   }    }
   if ( $response =~ /[^\s]/) {    if ( $response =~ /[^\s]/) {
Line 220  sub end_foilgroup { Line 259  sub end_foilgroup {
     $responsestr;      $responsestr;
  $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;   $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
   
  if (!$Apache::lonhomework::scantronmode) {   if (($Apache::lonhomework::type eq 'survey') ||
               ($Apache::lonhomework::type eq 'surveycred') ||
               ($Apache::lonhomework::type eq 'anonsurvey') ||
               ($Apache::lonhomework::type eq 'anonsurveycred')) {
       if ($ignored == 0) {
                   my $ad;
                   if ($Apache::lonhomework::type eq 'anonsurveycred') {
                       $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
                   } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
                       $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
                   } elsif ($Apache::lonhomework::type eq 'surveycred') {
                       $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
                   } else {
       $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 238  sub end_foilgroup { Line 298  sub end_foilgroup {
  } else {   } else {
     my $ad;      my $ad;
     if ($wrong==0 && $right==0) {      if ($wrong==0 && $right==0) {
  #nothing submitted   #nothing submitted only assign a score if we 
    #need to override a previous grade
    if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
       $ad='ASSIGNED_SCORE';
    }
     } else {      } else {
  $ad='ASSIGNED_SCORE';   $ad='ASSIGNED_SCORE';
     }      }
Line 250  sub end_foilgroup { Line 314  sub end_foilgroup {
  }   }
       }        }
     }      }
     &Apache::lonxml::increment_counter(&getfoilcounts($max));      my $part_id     = $Apache::inputtags::part;
       my $response_id = $Apache::inputtags::response[-1];
       &Apache::lonxml::increment_counter(&getfoilcounts($max),
          "$part_id.$response_id");
       if ($target eq 'analyze') {
    &Apache::lonhomework::set_bubble_lines();
       }
   
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();      $result.=&Apache::edit::end_table();
   }    }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {    if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       if($env{'form.pdfFormFields'} ne 'yes') {
       $result .= '\end{enumerate}';        $result .= '\end{enumerate}';
       } else {
         $result .= "\\\\";
       }
   }    }
   &Apache::response::poprandomnumber();    &Apache::response::poprandomnumber();
   return $result;    return $result;
Line 279  sub whichfoils { Line 354  sub whichfoils {
 }  }
   
 sub displayanswers {  sub displayanswers {
   my ($max,$randomize,@opt)=@_;      my ($max,$randomize,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}      if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };      my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt = &whichfoils($max,$randomize);      my @whichopt = &whichfoils($max,$randomize);
   my $result=&Apache::response::answer_header('optionresponse');      my $result;
   foreach my $name (@whichopt) {      if ($Apache::lonhomework::type eq 'exam') {
     $result.=&Apache::response::answer_part('optionresponse',   my $i = 0;
      $Apache::response::foilgroup{$name.'.value'})   my %opt = map { ($_,$i++) } @opt;
   }  
   $result.=&Apache::response::answer_footer('optionresponse');   $i = 0;
   return $result;   my @alphabet = ('A'..'Z');
    foreach my $name (@whichopt) {
       $result.=&Apache::response::answer_header('optionresponse',$i++);
       $result.=&Apache::response::answer_part('optionresponse',
       $alphabet[$opt{$Apache::response::foilgroup{$name.'.value'}}]);
       $result.=&Apache::response::answer_part('optionresponse',
       $Apache::response::foilgroup{$name.'.value'});
       $result.=&Apache::response::answer_footer('optionresponse');
    }
       } else {
    $result=&Apache::response::answer_header('optionresponse');
    foreach my $name (@whichopt) {
       $result.=&Apache::response::answer_part('optionresponse',
       $Apache::response::foilgroup{$name.'.value'});
    }
    $result.=&Apache::response::answer_footer('optionresponse');
       }
       return $result;
   }
   
   sub check_box_opt {
       my ($target,$checkboxvalue,@opt)=@_;
   # Check if we are in checkbox mode: checkboxvalue specified, on web, only two options.
   # If so, return "checked" value
       if ($#opt!=1) { return ''; }
       if ($target ne 'web') { return ''; }
       return $checkboxvalue;
 }  }
   
 sub check_for_invalid {  sub check_for_invalid {
Line 314  sub check_for_invalid { Line 415  sub check_for_invalid {
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,@opt)=@_;    my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}    if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;    my @truelist;
Line 334  sub displayfoils { Line 435  sub displayfoils {
     my $temp=1;      my $temp=1;
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
  my $text=$Apache::response::foilgroup{$name.'.text'};   my $text=$Apache::response::foilgroup{$name.'.text'};
  my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});          my $lastresp;
           unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
               $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
           }
    my %lastresponse=&Apache::lonnet::str2hash($lastresp);
  my $lastopt=$lastresponse{$name};   my $lastopt=$lastresponse{$name};
  if ($text!~/^\s*$/) { $break='<br />'; }   if ($text!~/^\s*$/) { $break='<br />'; }
  $result.=$break;   $result.=$break;
Line 344  sub displayfoils { Line 449  sub displayfoils {
  if ($text=~/^\s*$/) {   if ($text=~/^\s*$/) {
     $text=$value.$text;      $text=$value.$text;
  } else {   } else {
     $text=$value.': '.$text;      $text='<b>'.$value.':</b> '.$text;
  }   }
     } else {      } else {
  $text='&#149;'.$text;   $text='&#149;'.$text;
     }      }
     $result.=$text."\n";      $result.=$text."\n";
       }   }
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
   $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);    $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
       }        }
Line 360  sub displayfoils { Line 465  sub displayfoils {
     my $temp=1;      my $temp=1;
     my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});      my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
     my $internal_counter=$Apache::lonxml::counter;      my $internal_counter=$Apache::lonxml::counter;
       my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
       if ($checkboxopt) {
          $result.='<br />'.&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. '.
                   &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
       }
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
       my $text=$Apache::response::foilgroup{$name.'.text'};        my $text=$Apache::response::foilgroup{$name.'.text'};
       if ($text!~/^\s*$/) {        if ($text!~/^\s*$/) {
Line 371  sub displayfoils { Line 481  sub displayfoils {
       }        }
       my $lastopt=$lastresponse{$name};        my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";        my $optionlist="<option></option>\n";
       my $option;  
       foreach $option (@opt) {        if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes'
  if ($option eq $lastopt) {           && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
   $optionlist.="<option selected=\"on\">$option</option>\n";            my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp;
  } else {            $optionlist =  &Apache::lonxml::print_pdf_start_combobox($fieldname);
   $optionlist.="<option>$option</option>\n";        }
  }  
         foreach my $option (@opt) {
     my $escopt=&HTML::Entities::encode($option,'\'"&<>');
             if ($option eq $lastopt) {
                 if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
                     && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
                     && $Apache::lonhomework::type ne 'exam') {
                     $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                 } else {
                     $optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n";
                 }
             } else {
                 if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
                     && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
                     && $Apache::lonhomework::type ne 'exam') {
                     $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                 } else {
                     $optionlist.="<option value='".$escopt."'>$option</option>\n";
                 }
             }
       }        }
       if ($target ne 'tex') {        if ($target ne 'tex') {
   if ($Apache::lonhomework::type ne 'exam') {    if ($Apache::lonhomework::type ne 'exam') {
       $optionlist='<select name="HWVAL_'.  # we are on the web, this is not an exam, and the problem can be answered
                 if ($checkboxopt) {
   # generate checkboxes
                     my $fieldname=$Apache::inputtags::response['-1'].':'.$temp;
                     my $altopt=$opt[0];
                     if ($opt[0] eq $checkboxopt) {
                        $altopt=$opt[1];
                     }
                     my $defopt=$lastopt;
                     unless ($defopt) { $defopt=$altopt; }
                     my $escdefopt=&HTML::Entities::encode($defopt,'\'"&<>');
                     my $esccheckboxopt=&HTML::Entities::encode($checkboxopt,'\'"&<>');
                     my $escaltopt=&HTML::Entities::encode($altopt,'\'"&<>');
   # checkboxopt is how the box is labelled
   # altopt is the alternative option
   # lastopt is what the user submitted before
   # defopt is what the field is going to start out with: either previous choice or altopt
   # fieldname is this input field's name after HWVAL_
                     $optionlist='<input type="hidden" name="HWVAL_'.$fieldname.'" value="'.$escdefopt.'" />'.
                     '<input type="checkbox" name="HWCHK_'.$fieldname.'" onclick="javascript:if (this.form.elements[\'HWCHK_'.
                     $fieldname.'\'].checked) { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$esccheckboxopt.'\'; } else { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$escaltopt.'\'; };setSubmittedPart(\''.$part.'\');"'.($defopt eq $checkboxopt?' checked="checked"':'')." />\n";
                 } else {
   # classic selection list
             $optionlist='<select onchange="javascript:setSubmittedPart(\''.
     $part.'\');" name="HWVAL_'.
   $Apache::inputtags::response['-1'].':'.$temp.'">'.    $Apache::inputtags::response['-1'].':'.$temp.'">'.
   $optionlist."</select>\n";    $optionlist."</select>\n";
                 }
   } else {    } else {
       $optionlist='<u>'.('&nbsp;'x10).'</u>';        $optionlist='<u>'.('&nbsp;'x10).'</u>';
   }    }
Line 408  sub displayfoils { Line 562  sub displayfoils {
       $texoptionlist = &optionlist_correction($TeXlayout,@opt);        $texoptionlist = &optionlist_correction($TeXlayout,@opt);
   }    }
   if ($text=~/<drawoptionlist\s*\/>/) {    if ($text=~/<drawoptionlist\s*\/>/) {
       $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;        $text=~s|<drawoptionlist\s*\/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |g;
   }    }
   
   if ($text=~m/\\item /) {    if ($text=~m/\\item /) {
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
           $text=~s/\\item/\\vskip 2 mm/;            $text=~s/\\item/\\vskip 2 mm/;
       }        } elsif ($env{'form.pdfFormFields'} ne 'yes') {
       $result.= $texoptionlist.$text;                    $result.= $texoptionlist.$text;
   } else {                }
             } else {
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
   $result.= $texoptionlist.'  '.$text;    $result.= $texoptionlist.'  '.$text;
       } else {        } elsif ($env{'form.pdfFormFields'} ne 'yes') {
   if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;}    if ($text=~/\S/) {
                         $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;
                     } else {
                         $result.= $texoptionlist;
                     }
       }        }
   }    }
   if ($Apache::lonhomework::type eq 'exam') {    if ($Apache::lonhomework::type eq 'exam') {
Line 429  sub displayfoils { Line 588  sub displayfoils {
   '\end{enumerate} \vskip -8 mm \strut ';    '\end{enumerate} \vskip -8 mm \strut ';
       $internal_counter++;        $internal_counter++;
   }    }
             if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
                 && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
                 && $Apache::lonhomework::type ne 'exam') {
                 $text =~ s/\\item//m;
                 $result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\';
                 $temp++;
             }
   $displayoptionintex=0;    $displayoptionintex=0;
       }        }
     }      }
   }    }
   
     if ($target eq 'web') {
         &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,
    [\@whichopt,
    'submissiongrading']);
     }
   
   if ($target ne 'tex') {    if ($target ne 'tex') {
       return $result.$break;        return $result.$break;
   } else {    } else {
Line 443  sub displayfoils { Line 616  sub displayfoils {
   
 sub optionlist_correction {  sub optionlist_correction {
     my ($TeXlayout,@options) = @_;      my ($TeXlayout,@options) = @_;
     my $texoptionlist='\\item [] Choices: ';      my $texoptionlist='\\item [] '.&mt('Choices:').' ';
     if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}      if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}
     if (scalar(@options) > 0) {      if (scalar(@options) > 0) {
  foreach my $option (@options) {   foreach my $option (@options) {
Line 453  sub optionlist_correction { Line 626  sub optionlist_correction {
     if ($TeXlayout eq 'vertical') {      if ($TeXlayout eq 'vertical') {
  $texoptionlist.=' \vskip 0 mm ',   $texoptionlist.=' \vskip 0 mm ',
     } else {      } else {
  $texoptionlist.=',';   $texoptionlist.=', ';
     }      }
  }   }
  chop($texoptionlist);   $texoptionlist=~s/, $//;
  if ($TeXlayout ne 'vertical') {$texoptionlist.='.';}   if ($TeXlayout ne 'vertical') {$texoptionlist.='.';}
     } else {      } else {
  if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';}   if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';}
Line 491  sub webbubbles { Line 664  sub webbubbles {
   
   
 sub bubbles {  sub bubbles {
     my ($ralphabit,$ropt) = @_;      my ($ralphabet,$ropt,$response, $max_width) = @_;
     my @alphabet = @$ralphabit;      my @alphabet = @$ralphabet;
     my @opt = @$ropt;      my @opt = @$ropt;
     my ($result,$head,$line) =('','','');      my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;      my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;      my $current_length = 0;
     my $textwidth;      my $textwidth;
     if ($ENV{'form.textwidth'} ne '') {      if (defined($max_width)) {
  $ENV{'form.textwidth'}=~/(\d+)/;   $textwidth=$max_width;
    &Apache::lonxml::debug("Max width passed in: $max_width");
       } elsif ($env{'form.textwidth'} ne '') {
    $env{'form.textwidth'}=~/(\d+)/;
  $textwidth=$1;   $textwidth=$1;
    &Apache::lonxml::debug("Max width from form: $textwidth");
     } else {      } else {
  $ENV{'textwidth'}=~/(\d*)\.?(\d*)/;   $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
  $textwidth=$1.'.'.$2;   $textwidth=$1.'.'.$2;
    &Apache::lonxml::debug("Max width defaults? $textwidth");
     }      }
       &Apache::lonxml::debug("Final maxwidth: $textwidth");
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
  my $leftmargin;   my $leftmargin;
  $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);   $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
    if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
  if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}   if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
   
  $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;   $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
  if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {   if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
     $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';      $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
     $head.='lr';      $head.='lr';
  } else {   } else {
     $line=~s/\&\s*$//;      $line=~s/\&\s*$//;
     $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';      $result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
     $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;      $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
     $head ='lr';      $head ='lr';
     $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;      $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
Line 603  sub end_foil { Line 784  sub end_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') { 
       $text=&Apache::lonxml::endredirection;        $text=&Apache::lonxml::endredirection;
       $text=~/(\w)/;        if ($target eq 'tex') {$text=~s/\\strut\s*\\\\\s*\\strut/\\vskip 0 mm/;}
       if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;}         if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;} 
   }    }
   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') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);      my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
       if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
    $text='\vskip 5mm $\triangleright$ '.$text;
       }
     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 eq "") {
     &Apache::lonxml::warning(&mt('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 [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));
       }        }
       $Apache::response::foilnames{$name}++;        $Apache::response::foilnames{$name}++;
       my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);        my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
Line 623  sub end_foil { Line 810  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' and $Apache::lonhomework::type eq 'exam') {   $Apache::response::conceptgroup{"$name.text"} = $text;
     $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\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 ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {   $Apache::response::foilgroup{"$name.text"} = $text;
     $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;  
  } else {  
     $Apache::response::foilgroup{"$name.text"} = $text;  
  }  
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
       }        }
     }      }
Line 647  sub end_foil { Line 826  sub end_foil {
   return $result;    return $result;
 }  }
   
   sub start_drawoptionlist {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       if ($target !~ /^(?:meta|answer|modified|edit)$/) {
    return $token->[4];
       }
   }
   
   sub end_drawoptionlist {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       if ($target !~ /^(?:meta|answer|modified|edit)$/) {
    return $token->[2];
       }
   }
   
 sub insert_foil {  sub insert_foil {
   return '      return '
 <foil name="" value="unused">  <foil name="" value="unused">
 <startouttext />  <startouttext />
 <endouttext />  <endouttext />
 </foil>';  </foil>';
 }  }
   
   sub insert_drawoptionlist {
       return '<drawoptionlist />';
   }
 1;  1;
 __END__  __END__
     
   =head1 NAME
   
   Apache::optionresponse.pm;
   
   =head1 SYNOPSIS
   
   Handles tags associated with showing a list of
   options.
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 HANDLER SUBROUTINE
   
   start_optionresponse()
   
   =head1 OTHER SUBROUTINES
   
   =over
   
   =item end_optionresponse()
   
   =item start_foilgroup()
   
   =item end_foilgroup()
   
   =item getfoilcounts()
   
   =item displayanswers()
   
   =item check_for_invalid()
   
   =item displayfoils()
   
   =item optionlist_correction()
   
   =item webbubbles()
   
   =item bubbles()
   
   =item start_conceptgroup()
   
   =item end_conceptgroup()
   
   =item insert_conceptgroup()
   
   =item start_foil()
   
   =item end_foil()
   
   =item start_drawoptionlist()
   
   =item end_drawoptionlist()
   
   =item insert_foil()
   
   =item insert_drawoptionlist()
   
   =back
   
   =cut

Removed from v.1.111  
changed lines
  Added in v.1.164


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