| $lt{'sel'} |
- Add new Option:
+ $lt{'add'}
|
- Delete an Option:
+ | $lt{'del'}
|
ENDTABLE
$result.= ''.&Apache::edit::checked_arg('Print options:','texoptions',
- [ ['nochoice','Don\'t show option list'] ]
+ [ ['nochoice',"Don't show option list"] ]
,$token).' | ';
$result.= '';
+ $result.=' ';
$result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
- [ ['nochoice','Don\'t show option list'] ]
+ [ ['nochoice',"Don't show option list"] ]
+ ,$token).' '.
+ &Apache::edit::checked_arg('','noprompt',
+ [ ['nochoice','Omit "Select all that are ... "' ] ]
,$token).' | ';
$result.= &Apache::edit::end_row();
$result.= &Apache::edit::start_spanning_row();
@@ -148,24 +160,24 @@ ENDTABLE
if ($target eq 'modified') {
my @options;
my $optchanged=0;
- eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+
+
+ eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1);
+
if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
&Apache::lonxml::debug("Deleting :$delopt:");
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,
- 'texoptions','checkboxvalue','checkboxoptions');
+ 'texoptions','checkboxvalue','checkboxoptions',
+ 'noprompt');
if ($optchanged || $rebuildtag ) {
$result = "[2]{'texoptions'}.'" ';
$result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
- $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
+ $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'" ';
+ $result .= 'noprompt="'.$token->[2]{'noprompt'}.'"';
$result .= '>';
} # else nothing changed so just use the default mechanism
}
@@ -207,13 +220,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 +241,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);
@@ -303,6 +301,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);
@@ -406,6 +405,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
@@ -425,8 +444,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') {
@@ -485,9 +507,13 @@ sub check_for_invalid {
}
sub displayfoils {
- my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_;
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
+ $tex_option_switch, $no_tfprompt, @opt)=@_;
+ my @names;
+ if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+ @names = @{ $Apache::response::foilgroup{'names'} };
+ }
+ unless (@names > 0) { return;}
my @truelist;
my @falselist;
my $result;
@@ -495,7 +521,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;
@@ -505,8 +533,15 @@ sub displayfoils {
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
my $lastresp;
- unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
$lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
+ } else {
+ unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+ $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
+ }
}
my %lastresponse=&Apache::lonnet::str2hash($lastresp);
my $lastopt=$lastresponse{$name};
@@ -545,14 +580,25 @@ sub displayfoils {
}
}
unless ($newvariation) {
- %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ %lastresponse =
+ &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ } else {
+ unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+ %lastresponse =
+ &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ }
+ }
}
my $internal_counter=$Apache::lonxml::counter;
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
- if ($checkboxopt) {
+ if ($checkboxopt && (!$no_tfprompt)) {
$result.='
'.
($checkboxchoices?&mt('Choices: ').''.$opt[0].','.$opt[1].'. ':'').
- &mt('Select all that are [_1].',$checkboxopt);
+ &mt('Select all that are [_1].',''.$checkboxopt.'');
}
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -803,7 +849,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) {