| $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'] ]
- ,$token);
+ $result.= ''.&Apache::edit::checked_arg('Print options:','texoptions',
+ [ ['nochoice',"Don't show option list"] ]
+ ,$token).' | ';
+ $result.= ' ';
+ $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
+ [ ['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();
$result.= $insertlist.'
';
@@ -129,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'));
+ 'texoptions','checkboxvalue','checkboxoptions',
+ 'noprompt');
if ($optchanged || $rebuildtag ) {
$result = "[2]{'texoptions'}.'" ';
+ $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
+ $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'" ';
+ $result .= 'noprompt="'.$token->[2]{'noprompt'}.'"';
$result .= '>';
} # else nothing changed so just use the default mechanism
}
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
if($env{'form.pdfFormFields'} ne 'yes') {
- $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
- \begin{enumerate} ';
+ $result .= ' \begin{itemize} ';
} else {
$result .= "\\\\";
}
@@ -185,13 +218,17 @@ sub end_foilgroup {
my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
-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,@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);
@@ -203,7 +240,9 @@ sub end_foilgroup {
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
} elsif ( $target eq 'grade') {
+
if ( &Apache::response::submitted()) {
+
my @whichopt = &whichfoils($max,$randomize);
my $temp=1;my $name;
my %responsehash;
@@ -211,11 +250,43 @@ sub end_foilgroup {
my $right=0;
my $wrong=0;
my $ignored=0;
+ my ($numrows,$bubbles_per_row);
+ if ($Apache::lonhomework::scantronmode) {
+ my $numitems = scalar(@opt);
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows($numitems);
+ }
+ if ($numrows < 1) {
+ $numrows = 1;
+ }
foreach $name (@whichopt) {
- my $response=&Apache::response::getresponse($temp);
- if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) {
- $response = $opt[$response];
- }
+ my $response;
+ if ($env{'form.submitted'} eq 'scantron') {
+ if ($numrows > 1) {
+ my $num = $temp;
+ my $totalnum;
+ for (my $i=0; $i<$numrows; $i++) {
+ my $item = &Apache::response::getresponse($num);
+ if ($item =~ /^\d+$/) {
+ $totalnum = $i*$bubbles_per_row + $item;
+ }
+ $num ++;
+ }
+ if ($totalnum =~ /^\d+$/) {
+ $response = $opt[$totalnum];
+ }
+ $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]/) {
$responsehash{$name}=$response;
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -228,9 +299,9 @@ sub end_foilgroup {
} else {
$ignored++;
}
- $temp++;
}
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);
@@ -240,17 +311,34 @@ sub end_foilgroup {
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
-
- if ($Apache::lonhomework::type eq 'survey') {
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt);
+ }
+ if (($Apache::lonhomework::type eq 'survey') ||
+ ($Apache::lonhomework::type eq 'surveycred') ||
+ ($Apache::lonhomework::type eq 'anonsurvey') ||
+ ($Apache::lonhomework::type eq 'anonsurveycred')) {
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);
} elsif ($wrong==0 && $right==0) {
} else {
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
&Apache::response::handle_previous(\%previous,$ad);
}
- } elsif (!$Apache::lonhomework::scantronmode) {
+ } elsif ($nonlenient) {
+#
+# Non-lenient mode. All right or all wrong
+#
my $ad;
if ($wrong==0 && $ignored==0) {
$ad='EXACT_ANS';
@@ -266,6 +354,9 @@ sub end_foilgroup {
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
&Apache::response::handle_previous(\%previous,$ad);
} else {
+#
+# This is lenient mode
+#
my $ad;
if ($wrong==0 && $right==0) {
#nothing submitted only assign a score if we
@@ -286,8 +377,16 @@ sub end_foilgroup {
}
my $part_id = $Apache::inputtags::part;
my $response_id = $Apache::inputtags::response[-1];
- &Apache::lonxml::increment_counter(&getfoilcounts($max),
- "$part_id.$response_id");
+ my ($numrows,$bubbles_per_row);
+ if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) {
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows(scalar(@opt));
+ }
+ if ($numrows < 1) {
+ $numrows = 1;
+ }
+ my $increment = &getfoilcounts($max) * $numrows;
+ &Apache::lonxml::increment_counter($increment,"$part_id.$response_id");
if ($target eq 'analyze') {
&Apache::lonhomework::set_bubble_lines();
}
@@ -297,7 +396,7 @@ sub end_foilgroup {
}
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
if($env{'form.pdfFormFields'} ne 'yes') {
- $result .= '\end{enumerate}';
+ $result .= '\end{itemize}';
} else {
$result .= "\\\\";
}
@@ -306,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
@@ -325,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') {
@@ -354,6 +476,15 @@ sub displayanswers {
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 {
my ($names,$options) = @_;
my %bad_names;
@@ -376,9 +507,13 @@ sub check_for_invalid {
}
sub displayfoils {
- my ($target,$max,$randomize,$TeXlayout,@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;
@@ -386,17 +521,29 @@ 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;
- my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
if ( ($target ne 'tex') &&
&Apache::response::show_answer() ) {
my $temp=1;
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
- my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ my $lastresp;
+ 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};
if ($text!~/^\s*$/) { $break='
'; }
$result.=$break;
@@ -409,7 +556,9 @@ sub displayfoils {
$text=''.$value.': '.$text;
}
} else {
- $text='•'.$text;
+ if (@whichopt > 1) {
+ $text='•'.$text;
+ }
}
$result.=$text."\n";
}
@@ -420,8 +569,37 @@ sub displayfoils {
}
} else {
my $temp=1;
- my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ my %lastresponse;
+ my $newvariation;
+ if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') ||
+ ($Apache::lonhomework::type eq 'randomizetry')) &&
+ ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+ if ($env{'form.'.$part.'.rndseed'} ne
+ $Apache::lonhomework::history{"resource.$part.rndseed"}) {
+ $newvariation = 1;
+ }
+ }
+ unless ($newvariation) {
+ 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 && (!$no_tfprompt)) {
+ $result.='
'.
+ ($checkboxchoices?&mt('Choices: ').''.$opt[0].','.$opt[1].'. ':'').
+ &mt('Select all that are [_1].',''.$checkboxopt.'');
+ }
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($text!~/^\s*$/) {
@@ -434,7 +612,8 @@ sub displayfoils {
my $lastopt=$lastresponse{$name};
my $optionlist="\n";
- if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes') {
+ if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp;
$optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
}
@@ -442,13 +621,17 @@ sub displayfoils {
foreach my $option (@opt) {
my $escopt=&HTML::Entities::encode($option,'\'"&<>');
if ($option eq $lastopt) {
- if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+ && $Apache::lonhomework::type ne 'exam') {
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
} else {
$optionlist.="\n";
}
} else {
- if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+ && $Apache::lonhomework::type ne 'exam') {
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
} else {
$optionlist.="\n";
@@ -457,16 +640,42 @@ sub displayfoils {
}
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $optionlist='