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

Diff for /loncom/homework/optionresponse.pm between versions 1.183 and 1.186

version 1.183, 2011/11/29 13:24:38 version 1.186, 2012/06/25 10:36:00
Line 32 Line 32
   
 package Apache::optionresponse;  package Apache::optionresponse;
 use strict;  use strict;
 use Apache::inputtags();  
 use Apache::response();  use Apache::response();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
Line 204  sub end_foilgroup { Line 203  sub end_foilgroup {
      -2,0);       -2,0);
     my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);      my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
     my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');      my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');
       my $noprompt       =&Apache::lonxml::get_param('noprompt', $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,$checkboxvalue,$checkboxchoices,$tex_option_switch,@opt);        $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt, @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 283  sub end_foilgroup { Line 284  sub end_foilgroup {
   }    }
  }   }
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
         my $nonlenient=&Apache::inputtags::grading_is_nonlenient($part);          my $nonlenient=&grading_is_nonlenient($part);
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $responsestr=&Apache::lonnet::hash2str(%responsehash);   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
  my $gradestr   =&Apache::lonnet::hash2str(%grade);   my $gradestr   =&Apache::lonnet::hash2str(%grade);
Line 387  sub end_foilgroup { Line 388  sub end_foilgroup {
   return $result;    return $result;
 }  }
   
   sub grading_is_nonlenient {
       my ($part) = @_;
   # Web mode: we are non-lenient unless told otherwise
       my $defaultparm = 'off';
       my $nonlenient = 0;
   # Grading a bubblesheet exam: we are grading lenient unless told otherwise
       if ($Apache::lonhomework::scantronmode) {
           $defaultparm = 'on';
           $nonlenient = 1;
       }
       my $lenientparm =
           &Apache::response::get_response_param($part,'lenient',$defaultparm);
       if ($lenientparm=~/^0|off|no$/i) {
           $nonlenient = 1;
       } elsif ($lenientparm=~/^1|on|yes$/i) {
           $nonlenient = 0;
       }
       return $nonlenient;
   }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($max)=@_;    my ($max)=@_;
   # +1 since instructors will count from 1    # +1 since instructors will count from 1
Line 467  sub check_for_invalid { Line 488  sub check_for_invalid {
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,    my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
       $tex_option_switch,@opt)=@_;        $tex_option_switch, $no_tfprompt, @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 533  sub displayfoils { Line 554  sub displayfoils {
     }      }
     my $internal_counter=$Apache::lonxml::counter;      my $internal_counter=$Apache::lonxml::counter;
     my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);      my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
     if ($checkboxopt) {      if ($checkboxopt && (!$no_tfprompt)) {
        $result.='<br />'.         $result.='<br />'.
                 ($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').                  ($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').
                  &mt('Select all that are <b>[_1]</b>.',$checkboxopt);                   &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
Line 787  sub bubbles { Line 808  sub bubbles {
  if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$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($item)+4)*2;   $current_length += (length($opt[$ind])+length($item)+5)*2;
                   
  if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {   if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
                           
Removed from v.1.183  
changed lines
  Added in v.1.186

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