--- loncom/homework/optionresponse.pm 2013/07/19 18:24:21 1.191 +++ loncom/homework/optionresponse.pm 2018/02/28 13:20:50 1.201 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.191 2013/07/19 18:24:21 bisitz Exp $ +# $Id: optionresponse.pm,v 1.201 2018/02/28 13:20:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,7 +51,8 @@ sub start_optionresponse { undef(%Apache::response::foilnames); if ($target eq 'edit') { $result.=&Apache::edit::start_table($token) - .''.&mt('Multiple Option Response Question').' ' + .''.&Apache::loncommon::insert_folding_button().' ' + .&mt('Multiple Option Response Question').' ' .&Apache::loncommon::help_open_topic('Option_Response_Problems')."" .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token) @@ -64,7 +65,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(); @@ -120,17 +121,24 @@ sub start_foilgroup { } my $insertlist=&Apache::edit::insertlist($target,$token); $result.=&Apache::edit::start_table($token); - $result.= (<Select Options + 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.= sprintf(<%s $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.'
'; @@ -168,7 +204,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 } @@ -210,7 +265,11 @@ 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); + 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"); @@ -218,7 +277,7 @@ sub end_foilgroup { 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,$tex_option_switch, $noprompt, @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); @@ -240,6 +299,11 @@ sub end_foilgroup { my $right=0; my $wrong=0; my $ignored=0; + my $checked=0; + my $corrchkd=0; + my $corrunchkd=0; + my $incorrchkd=0; + my $incorrunchkd=0; my ($numrows,$bubbles_per_row); if ($Apache::lonhomework::scantronmode) { my $numitems = scalar(@opt); @@ -249,6 +313,30 @@ 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; + } + } + } + } + my $part=$Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my @relweights; + my $nonlenient=&grading_is_nonlenient($part,$id,\@relweights); foreach $name (@whichopt) { my $response; if ($env{'form.submitted'} eq 'scantron') { @@ -286,13 +374,26 @@ sub end_foilgroup { } else { $grade{$name}='0'; $wrong++; } + if ($checkboxopt) { + if ($response eq $checkboxopt) { + $checked++; + if ($grade{$name}) { + $corrchkd ++; + } else { + $incorrchkd ++; + } + } else { + if ($grade{$name}) { + $corrunchkd ++; + } else { + $incorrunchkd ++; + } + } + } } else { $ignored++; } } - 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); my %previous=&Apache::response::check_for_previous($responsestr, @@ -304,65 +405,90 @@ 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; + my $awarded; + my $totalfoils = $#{ $Apache::response::foilgroup{'names'} }+1; + if (($checkboxopt) && ($max >= $totalfoils) && (@relweights > 0)) { + if ($right == scalar(@whichopt)) { + $awarded = 1; + } else { + $awarded = ($corrchkd*$relweights[0] + $corrunchkd*$relweights[1] + + $incorrchkd*$relweights[2] + $incorrunchkd*$relweights[3])/(scalar(@whichopt)); + $awarded = 1 if ($awarded > 1); + $awarded = 0 if ($awarded < 0); + } + } else { + $awarded = $right/(scalar(@whichopt)); + } + $Apache::lonhomework::results{"resource.$part.$id.awarded"}= + $awarded; + $Apache::lonhomework::results{"resource.$part.$id.numfoils"}= + scalar(@whichopt); + } + } } } my $part_id = $Apache::inputtags::part; @@ -396,22 +522,38 @@ sub end_foilgroup { } sub grading_is_nonlenient { - my ($part) = @_; + my ($part,$id,$relweights) = @_; # Web mode: we are non-lenient unless told otherwise my $defaultparm = 'off'; - my $nonlenient = 0; + my $nonlenient = 1; # Grading a bubblesheet exam: we are grading lenient unless told otherwise if ($Apache::lonhomework::scantronmode) { $defaultparm = 'on'; - $nonlenient = 1; + $nonlenient = 0; } my $lenientparm = &Apache::response::get_response_param($part,'lenient',$defaultparm); - if ($lenientparm=~/^0|off|no$/i) { + if ($lenientparm eq 'default') { + $lenientparm = $defaultparm; + } + $lenientparm = + &Apache::response::get_response_param($part.'_'.$id,'lenient',$lenientparm); + if ($lenientparm eq 'default') { + $lenientparm = $defaultparm; + } + if ($lenientparm=~/^(?:0|off|no)$/i) { $nonlenient = 1; - } elsif ($lenientparm=~/^1|on|yes$/i) { + } elsif ($lenientparm=~/^(?:1|on|yes)$/i) { + $nonlenient = 0; + } elsif ($lenientparm =~ /^\-?[.\d]+,\-?[.\d]+,\-?[.\d]+,\-?[.\d]+$/) { + if (ref($relweights) eq 'ARRAY') { + @{$relweights} = split(/,/,$lenientparm); + } $nonlenient = 0; } + if (!$nonlenient) { + $Apache::inputtags::leniency=1; + } return $nonlenient; } @@ -471,7 +613,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; } @@ -498,7 +640,7 @@ sub check_for_invalid { sub displayfoils { my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices, - $tex_option_switch, $no_tfprompt, @opt)=@_; + $tex_option_switch, $no_tfprompt, $maxcheck, $mincheck, @opt)=@_; my @names; if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { @names = @{ $Apache::response::foilgroup{'names'} }; @@ -584,7 +726,10 @@ sub displayfoils { } } my $internal_counter=$Apache::lonxml::counter; - my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); + 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].'. ':''). @@ -650,7 +795,7 @@ sub displayfoils { # fieldname is this input field's name after HWVAL_ $optionlist=''. '\n"; + $fieldname.'\'].checked) { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$esccheckboxopt.'\'; } else { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$escaltopt.'\'; };javascript:setSubmittedPart(\''.$part.'\');"'.($defopt eq $checkboxopt?' checked="checked"':'')." />\n"; } else { # classic selection list $optionlist='