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

Diff for /loncom/homework/optionresponse.pm between versions 1.159 and 1.163

version 1.159, 2010/02/05 15:34:02 version 1.163, 2010/02/28 23:40:53
Line 123  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.= &Apache::edit::checked_arg('Print options:','texoptions',      $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',
  [ ['nochoice','Don\'t show option list'] ]   [ ['nochoice','Don\'t show option list'] ]
  ,$token);   ,$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 151  ENDTABLE Line 162  ENDTABLE
       $optchanged=1;        $optchanged=1;
     }      }
     my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,      my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
  ('texoptions'));   'texoptions','checkboxvalue');
     if ($optchanged || $rebuildtag ) {      if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";        $result = "<foilgroup options=\"(";
       foreach my $option (@options) {        foreach my $option (@options) {
Line 162  ENDTABLE Line 173  ENDTABLE
       chop $result;        chop $result;
       $result.=')" ';        $result.=')" ';
       $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';        $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
         $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
       $result .= '>';        $result .= '>';
     } # else nothing changed so just use the default mechanism      } # else nothing changed so just use the default mechanism
   }    }
Line 190  sub end_foilgroup { Line 202  sub end_foilgroup {
   
     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;        $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {      } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);        $result.=&displayanswers($max,$randomize,@opt);
Line 246  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::type eq 'survey') {   if (($Apache::lonhomework::type eq 'survey') ||
               ($Apache::lonhomework::type eq 'surveycred') ||
               ($Apache::lonhomework::type eq 'anonsurvey') ||
               ($Apache::lonhomework::type eq 'anonsurveycred')) {
     if ($ignored == 0) {      if ($ignored == 0) {
  my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';                  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);   &Apache::response::handle_previous(\%previous,$ad);
     } elsif ($wrong==0 && $right==0) {      } elsif ($wrong==0 && $right==0) {
     } else {      } else {
Line 359  sub displayanswers { Line 384  sub displayanswers {
     return $result;      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 {
     my ($names,$options) = @_;      my ($names,$options) = @_;
     my %bad_names;      my %bad_names;
Line 381  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 401  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 427  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 463  sub displayfoils { Line 506  sub displayfoils {
               }                }
           }            }
       }        }
 # debug for checkbox  
       my $checkboxopt='';  
 # end debug for checkbox  
       if ($target ne 'tex') {        if ($target ne 'tex') {
   if ($Apache::lonhomework::type ne 'exam') {    if ($Apache::lonhomework::type ne 'exam') {
 # we are on the web, this is not an exam, and the problem can be answered  # we are on the web, this is not an exam, and the problem can be answered
Line 487  sub displayfoils { Line 527  sub displayfoils {
 # defopt is what the field is going to start out with: either previous choice or altopt  # 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_  # fieldname is this input field's name after HWVAL_
                   $optionlist='<input type="hidden" name="HWVAL_'.$fieldname.'" value="'.$escdefopt.'" />'.                    $optionlist='<input type="hidden" name="HWVAL_'.$fieldname.'" value="'.$escdefopt.'" />'.
                   '<label><input type="checkbox" name="HWCHK_'.$fieldname.'" onclick="javascript:if (this.form.elements[\'HWCHK_'.                    '<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"':'').' /><i>'.$checkboxopt.":</i></label>\n";                    $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 {                } else {
 # classic selection list  # classic selection list
           $optionlist='<select onchange="javascript:setSubmittedPart(\''.            $optionlist='<select onchange="javascript:setSubmittedPart(\''.
Removed from v.1.159  
changed lines
  Added in v.1.163

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