--- loncom/homework/optionresponse.pm 2011/09/13 21:42:58 1.177
+++ loncom/homework/optionresponse.pm 2012/10/12 12:45:46 1.187
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.177 2011/09/13 21:42:58 raeburn Exp $
+# $Id: optionresponse.pm,v 1.187 2012/10/12 12:45:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -155,13 +155,9 @@ ENDTABLE
splice(@options,$delopt-1,1);
$optchanged=1;
}
- if ($env{"form.$Apache::lonxml::curdepth.options"}) {
+ if ($env{"form.$Apache::lonxml::curdepth.options"} ne '') {
my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
- if ($options[0]) {
- push(@options,$newopt);
- } else {
- $options[0]=$newopt;
- }
+ push(@options,$newopt);
$optchanged=1;
}
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
@@ -207,13 +203,15 @@ sub end_foilgroup {
-2,0);
my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
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=();}
&Apache::lonxml::debug("Options are $#opt");
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$safeeval,'-2');
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, $noprompt, @opt);
$Apache::lonxml::post_evaluate=0;
} elsif ( $target eq 'answer') {
$result.=&displayanswers($max,$randomize,@opt);
@@ -226,23 +224,6 @@ sub end_foilgroup {
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
} elsif ( $target eq 'grade') {
- my $nonlenient=0;
- my $part=$Apache::inputtags::part;
- my $lenientparm=&Apache::lonnet::EXT("resource.$part.lenient");
-
- if ($Apache::lonhomework::scantronmode) {
- $nonlenient=0;
-# Grading an exam: we are grading lenient unless told not to
- if ($lenientparm=~/^0|off|no$/i) {
- $nonlenient=1;
- }
- } else {
-# Web mode: we are non-lenient unless told to
- $nonlenient=1;
- if ($lenientparm=~/^1|on|yes$/i) {
- $nonlenient=0;
- }
- }
if ( &Apache::response::submitted()) {
my @whichopt = &whichfoils($max,$randomize);
@@ -279,12 +260,14 @@ sub end_foilgroup {
}
$temp += $numrows;
} else {
+ $response=&Apache::response::getresponse($temp);
if ($response=~/\S/) {
$response = $opt[$response];
}
$temp ++;
}
} else {
+ $response=&Apache::response::getresponse($temp);
$temp ++;
}
if ( $response =~ /[^\s]/) {
@@ -301,6 +284,7 @@ sub end_foilgroup {
}
}
my $part=$Apache::inputtags::part;
+ my $nonlenient=&grading_is_nonlenient($part);
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
my $gradestr =&Apache::lonnet::hash2str(%grade);
@@ -404,6 +388,26 @@ sub end_foilgroup {
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 {
my ($max)=@_;
# +1 since instructors will count from 1
@@ -423,8 +427,11 @@ sub whichfoils {
sub displayanswers {
my ($max,$randomize,@opt)=@_;
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @names;
+ if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+ @names = @{ $Apache::response::foilgroup{'names'} };
+ }
+ return if (!@names);
my @whichopt = &whichfoils($max,$randomize);
my $result;
if ($Apache::lonhomework::type eq 'exam') {
@@ -483,7 +490,8 @@ sub check_for_invalid {
}
sub displayfoils {
- my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_;
+ my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
+ $tex_option_switch, $no_tfprompt, @opt)=@_;
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
my @names = @{ $Apache::response::foilgroup{'names'} };
my @truelist;
@@ -493,7 +501,9 @@ sub displayfoils {
my $displayoptionintex=1;
my @alphabet = ('A'..'Z');
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 $id=$Apache::inputtags::response[-1];
my $break;
@@ -547,7 +557,7 @@ sub displayfoils {
}
my $internal_counter=$Apache::lonxml::counter;
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
- if ($checkboxopt) {
+ if ($checkboxopt && (!$no_tfprompt)) {
$result.='<br />'.
($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').
&mt('Select all that are <b>[_1]</b>.',$checkboxopt);
@@ -801,7 +811,7 @@ sub bubbles {
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
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) {
@@ -912,9 +922,6 @@ sub end_foil {
&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
$name=$Apache::lonxml::curdepth;
}
- if ($name eq "0") {
- &Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.','<b><tt>'.$name.'</tt></b>'));
- }
&Apache::lonxml::debug("Using a name of :$name:");
if (defined($Apache::response::foilnames{$name})) {
&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));