version 1.181, 2011/10/07 22:39:59
|
version 1.184, 2011/12/15 01:21:28
|
Line 209 sub end_foilgroup {
|
Line 209 sub end_foilgroup {
|
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,@opt); |
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch,@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 282 sub end_foilgroup {
|
Line 282 sub end_foilgroup {
|
} |
} |
} |
} |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $nonlenient=&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 386 sub end_foilgroup {
|
Line 386 sub end_foilgroup {
|
return $result; |
return $result; |
} |
} |
|
|
sub is_nonlenient { |
sub grading_is_nonlenient { |
my ($part) = @_; |
my ($part) = @_; |
# Web mode: we are non-lenient unless told otherwise |
# Web mode: we are non-lenient unless told otherwise |
my $defaultparm = 'off'; |
my $defaultparm = 'off'; |
my $nonlenient = 0; |
my $nonlenient = 0; |
# Grading a bubblesheet exam: we are grading lenient unless told otherwise |
# Grading a bubblesheet exam: we are grading lenient unless told otherwise |
if ($Apache::lonhomework::scantronmode) { |
if ($Apache::lonhomework::scantronmode) { |
$defaultparm = 'on'; |
$defaultparm = 'on'; |
$nonlenient = 1; |
$nonlenient = 1; |
} |
} |
my $lenientparm = |
my $lenientparm = |
&Apache::response::get_response_param($part,'lenient',$defaultparm); |
&Apache::response::get_response_param($part,'lenient',$defaultparm); |
if ($lenientparm=~/^0|off|no$/i) { |
if ($lenientparm=~/^0|off|no$/i) { |
$nonlenient = 1; |
$nonlenient = 1; |
} elsif ($lenientparm=~/^1|on|yes$/i) { |
} elsif ($lenientparm=~/^1|on|yes$/i) { |
Line 485 sub check_for_invalid {
|
Line 485 sub check_for_invalid {
|
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_; |
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices, |
|
$tex_option_switch,@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 495 sub displayfoils {
|
Line 496 sub displayfoils {
|
my $displayoptionintex=1; |
my $displayoptionintex=1; |
my @alphabet = ('A'..'Z'); |
my @alphabet = ('A'..'Z'); |
my @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
&check_for_invalid(\@whichopt,\@opt); |
unless (($target eq 'tex') && ($tex_option_switch eq 'nochoice')) { |
|
&check_for_invalid(\@whichopt,\@opt); |
|
} |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $break; |
my $break; |