--- loncom/homework/optionresponse.pm 2011/10/07 22:39:59 1.181 +++ loncom/homework/optionresponse.pm 2014/11/28 18:23:04 1.195 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.181 2011/10/07 22:39:59 raeburn Exp $ +# $Id: optionresponse.pm,v 1.195 2014/11/28 18:23:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,7 +64,7 @@ sub start_optionresponse { $token,'4'). &Apache::edit::select_arg('Randomize Foil Order:','randomize', ['yes','no'],$token). - &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout', + &Apache::edit::select_arg('Display of options when printed','TeXlayout', [['horizontal','Normal list'], ['vertical','Listed in a vertical column']],$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row(); @@ -108,7 +108,11 @@ sub start_foilgroup { my $optionlist="\n"; my $option; my @opt; - eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval); + my @raw_options = &Apache::lonxml::get_param('options', $parstack, $safeeval, 0, 0, 1); + + + eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1); + my $count=1; foreach $option (@opt) { $optionlist.="\n"; @@ -116,17 +120,24 @@ sub start_foilgroup { } my $insertlist=&Apache::edit::insertlist($target,$token); $result.=&Apache::edit::start_table($token); + my %lt = &Apache::lonlocal::texthash( + sel => 'Select Options', + add => 'Add new Option:', + del => 'Delete an Option:', + maxcheck => 'Enter maximum number students may check (e.g., 3)', + mincheck => 'Enter minimum number students need to check (e.g., 1)', + ); $result.= (<Select Options + $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.=' '; + my %checknumtxt = ( + maxcheck => 'Max. boxes permitted to check', + mincheck => 'Min. boxes required to check', + ); + my (%onclicknum,%checknum); + foreach my $item ('maxcheck','mincheck') { + $onclicknum{$item} = 'onclick="'."updateNumber('$item','$Apache::lonxml::curdepth','check','$lt{$item}');".'"'; + $checknum{$item} = &Apache::lonxml::get_param($item,$parstack,$safeeval); + } $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions', - [ ['nochoice','Don\'t show option list'] ] - ,$token).''; + [ ['nochoice',"Don't show option list"] ] + ,$token).' '. + &Apache::edit::checked_arg('','noprompt', + [ ['nochoice','Omit "Select all that are ... "' ] ] + ,$token); + foreach my $item ('maxcheck','mincheck') { + my $currnum = $checknum{$item}; + unless ($currnum =~ /^\d+$/) { + $currnum = 'nochoice'; + } + $result.= ' '. + &Apache::edit::checked_arg('',$item,[ [$currnum,$checknumtxt{$item}] ], + $token,$onclicknum{$item},1).' '. + ''; + if ($checknum{$item} ne '') { + $result .= ': '. + $checknum{$item}.''; + } + $result .= ''; + } + $result.= ''; $result.= &Apache::edit::end_row(); $result.= &Apache::edit::start_spanning_row(); $result.= $insertlist.'
'; @@ -148,7 +187,10 @@ 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:"); @@ -161,7 +203,23 @@ ENDTABLE $optchanged=1; } my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, - 'texoptions','checkboxvalue','checkboxoptions'); + 'texoptions','checkboxvalue','checkboxoptions', + 'noprompt','maxcheck','mincheck'); + if ($rebuildtag) { + my $maxcheck = $token->[2]->{'maxcheck'}; + my $mincheck = $token->[2]->{'mincheck'}; + if ($mincheck =~ /D/) { + $token->[2]->{'mincheck'}=''; + } + if ($maxcheck =~ /D/) { + $token->[2]->{'maxcheck'}=''; + } + if (($mincheck ne '') && ($maxcheck ne '')) { + if ($mincheck > $maxcheck) { + $token->[2]->{'mincheck'}=$maxcheck; + } + } + } 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 .= 'maxcheck="'.$token->[2]{'maxcheck'}.'" '; + $result .= 'mincheck="'.$token->[2]{'mincheck'}.'"'; $result .= '>'; } # else nothing changed so just use the default mechanism } @@ -203,13 +264,19 @@ 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 $maxcheck=&Apache::lonxml::get_param('maxcheck', $parstack, $safeeval); + $maxcheck =~ s/\D+//g; + my $mincheck=&Apache::lonxml::get_param('mincheck', $parstack, $safeeval); + $mincheck =~ s/\D+//g; + 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,$maxcheck,$mincheck, @opt); $Apache::lonxml::post_evaluate=0; } elsif ( $target eq 'answer') { $result.=&displayanswers($max,$randomize,@opt); @@ -231,6 +298,7 @@ sub end_foilgroup { my $right=0; my $wrong=0; my $ignored=0; + my $checked=0; my ($numrows,$bubbles_per_row); if ($Apache::lonhomework::scantronmode) { my $numitems = scalar(@opt); @@ -240,6 +308,26 @@ sub end_foilgroup { if ($numrows < 1) { $numrows = 1; } + my $checkboxopt; + if ($checkboxvalue) { + $checkboxopt = &check_box_opt($target,$checkboxvalue,@opt); + if (($checkboxopt) && ($Apache::lonhomework::type !~ /survey/)) { + my $corrnumcheck = 0; + if (($maxcheck ne '') || ($mincheck ne '')) { + foreach $name (@whichopt) { + if ($Apache::response::foilgroup{$name.'.value'} eq $checkboxopt) { + $corrnumcheck ++; + } + } + if (($maxcheck ne '') && ($corrnumcheck > $maxcheck)) { + $maxcheck = $corrnumcheck; + } + if (($mincheck ne '') && ($corrnumcheck < $mincheck)) { + $mincheck = $corrnumcheck; + } + } + } + } foreach $name (@whichopt) { my $response; if ($env{'form.submitted'} eq 'scantron') { @@ -277,12 +365,17 @@ sub end_foilgroup { } else { $grade{$name}='0'; $wrong++; } + if ($checkboxopt) { + if ($response eq $checkboxopt) { + $checked++; + } + } } else { $ignored++; } } my $part=$Apache::inputtags::part; - my $nonlenient=&is_nonlenient($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); @@ -295,65 +388,76 @@ sub end_foilgroup { 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; - 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 ($nonlenient) { + my $skipaward; + if ($checkboxvalue) { + if ((($maxcheck ne '') && ($checked > $maxcheck)) || + (($mincheck ne '') && ($checked < $mincheck))) { + my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='WRONG_NUMBOXESCHECKED'; + &Apache::response::handle_previous(\%previous,$ad); + $skipaward = 1; + } + } + unless ($skipaward) { + 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; + 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 ($nonlenient) { # # Non-lenient mode. All right or all wrong # - my $ad; - if ($wrong==0 && $ignored==0) { - $ad='EXACT_ANS'; - } elsif ($wrong==0 && $right==0) { - #nothing submitted - } else { - if ($ignored==0) { - $ad='INCORRECT'; - } else { - $ad='MISSING_ANSWER'; - } - } - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; - &Apache::response::handle_previous(\%previous,$ad); - } else { + my $ad; + if ($wrong==0 && $ignored==0) { + $ad='EXACT_ANS'; + } elsif ($wrong==0 && $right==0) { + #nothing submitted + } else { + if ($ignored==0) { + $ad='INCORRECT'; + } else { + $ad='MISSING_ANSWER'; + } + } + $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 - #need to override a previous grade - if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) { + my $ad; + if ($wrong==0 && $right==0) { + #nothing submitted only assign a score if we + #need to override a previous grade + if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) { + $ad='ASSIGNED_SCORE'; + } + } else { $ad='ASSIGNED_SCORE'; - } - } else { - $ad='ASSIGNED_SCORE'; - } - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; - $Apache::lonhomework::results{"resource.$part.$id.awarded"}= - $right/(scalar(@whichopt)); - $Apache::lonhomework::results{"resource.$part.$id.numfoils"}= - scalar(@whichopt); - } + } + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + $Apache::lonhomework::results{"resource.$part.$id.awarded"}= + $right/(scalar(@whichopt)); + $Apache::lonhomework::results{"resource.$part.$id.numfoils"}= + scalar(@whichopt); + } + } } } my $part_id = $Apache::inputtags::part; @@ -386,18 +490,18 @@ sub end_foilgroup { return $result; } -sub is_nonlenient { +sub grading_is_nonlenient { my ($part) = @_; -# Web mode: we are non-lenient unless told otherwise +# 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 +# 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); + my $lenientparm = + &Apache::response::get_response_param($part,'lenient',$defaultparm); if ($lenientparm=~/^0|off|no$/i) { $nonlenient = 1; } elsif ($lenientparm=~/^1|on|yes$/i) { @@ -425,8 +529,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') { @@ -459,7 +566,7 @@ sub check_box_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 ''; } + unless (($target eq 'web') || ($target eq 'grade')) { return ''; } return $checkboxvalue; } @@ -485,9 +592,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, $maxcheck, $mincheck, @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 +606,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 +618,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 +665,28 @@ 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) { + my $checkboxopt; + if ($target eq 'web') { + $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); + &mt('Select all that are [_1].',''.$checkboxopt.''); } foreach $name (@whichopt) { my $text=$Apache::response::foilgroup{$name.'.text'}; @@ -803,7 +937,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) {