--- loncom/homework/optionresponse.pm 2008/11/12 20:32:29 1.154 +++ loncom/homework/optionresponse.pm 2011/11/08 19:38:05 1.173.2.2 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.154 2008/11/12 20:32:29 jms Exp $ +# $Id: optionresponse.pm,v 1.173.2.2 2011/11/08 19:38:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,108 +27,7 @@ # -=head1 NAME - -Apache::optionresponse.pm; - -=head1 SYNOPSIS - -Handles tags associated with showing a list of -options. - -This is part of the LearningOnline Network with CAPA project -described at http://www.lon-capa.org. - -=head1 HANDLER SUBROUTINE - -start_optionresponse() - -=head1 OTHER SUBROUTINES - -=over - -=item * - -end_optionresponse() - -=item * - -start_foilgroup() - -=item * - -end_foilgroup() - -=item * - -getfoilcounts() - -=item * - -displayanswers() - -=item * -check_for_invalid() - -=item * - -displayfoils() - -=item * - -optionlist_correction() - -=item * - -webbubbles() - -=item * - -bubbles() - -=item * - -start_conceptgroup() - -=item * - -end_conceptgroup() - -=item * - -insert_conceptgroup() - - -=item * - -start_foil() - -=item * - -end_foil() - -=item * - -start_drawoptionlist() - -=item * - -end_drawoptionlist() - -=item * - -insert_foil() - -=item * - -insert_drawoptionlist() - -=item * - -=back - -=cut package Apache::optionresponse; @@ -166,8 +65,8 @@ sub start_optionresponse { &Apache::edit::select_arg('Randomize Foil Order:','randomize', ['yes','no'],$token). &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout', - [['horizontal',&mt('Normal list')], - ['vertical',&mt('Listed in a vertical column')]],$token). + [['horizontal','Normal list'], + ['vertical','Listed in a vertical column']],$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, @@ -204,7 +103,7 @@ sub start_foilgroup { my $result=''; %Apache::response::foilgroup=(); $Apache::optionresponse::conceptgroup=0; - &Apache::response::pushrandomnumber(); + &Apache::response::pushrandomnumber(undef,$target); if ($target eq 'edit') { my $optionlist="\n"; my $option; @@ -224,10 +123,24 @@ sub start_foilgroup { Delete an Option: + ENDTABLE - $result.= &Apache::edit::checked_arg('Print options:','texoptions', + $result.= ''.&Apache::edit::checked_arg('Print options:','texoptions', [ ['nochoice','Don\'t show option list'] ] - ,$token); + ,$token).''; + $result.= ''; + $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions', + [ ['nochoice','Don\'t show option list'] ] + ,$token).''; $result.= &Apache::edit::end_row(); $result.= &Apache::edit::start_spanning_row(); $result.= $insertlist.'
'; @@ -242,17 +155,13 @@ 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, - ('texoptions')); + 'texoptions','checkboxvalue','checkboxoptions'); if ($optchanged || $rebuildtag ) { $result = "[2]{'texoptions'}.'" '; + $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" '; + $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"'; $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 .= "\\\\"; } @@ -291,13 +201,15 @@ 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'); 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,@opt); $Apache::lonxml::post_evaluate=0; } elsif ( $target eq 'answer') { $result.=&displayanswers($max,$randomize,@opt); @@ -346,10 +258,24 @@ 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 { @@ -403,7 +329,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 .= "\\\\"; } @@ -460,6 +386,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; @@ -482,7 +417,8 @@ sub check_for_invalid { } sub displayfoils { - my ($target,$max,$randomize,$TeXlayout,@opt)=@_; + my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices, + $tex_option_switch,@opt)=@_; if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} my @names = @{ $Apache::response::foilgroup{'names'} }; my @truelist; @@ -492,7 +428,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; @@ -502,7 +440,11 @@ sub displayfoils { 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; + unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) { + $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"}; + } + my %lastresponse=&Apache::lonnet::str2hash($lastresp); my $lastopt=$lastresponse{$name}; if ($text!~/^\s*$/) { $break='
'; } $result.=$break; @@ -515,7 +457,9 @@ sub displayfoils { $text=''.$value.': '.$text; } } else { - $text='•'.$text; + if (@whichopt > 1) { + $text='•'.$text; + } } $result.=$text."\n"; } @@ -526,8 +470,26 @@ 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) { + %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) { + $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*$/) { @@ -540,7 +502,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); } @@ -548,13 +511,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"; @@ -563,16 +530,42 @@ sub displayfoils { } if ($target ne 'tex') { if ($Apache::lonhomework::type ne 'exam') { - $optionlist=''. + '\n"; + } else { +# classic selection list + $optionlist='\n"; + } } else { $optionlist=''.(' 'x10).''; } if ($text=~s||$optionlist|) { if ($Apache::lonhomework::type ne 'exam') { - $text='•'.$text; + if (@whichopt > 1) { + $text='•'.$text; + } } } else { if ($Apache::lonhomework::type ne 'exam') { @@ -612,14 +605,15 @@ sub displayfoils { } } if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'. - $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt). - '\end{enumerate} \vskip -8 mm \strut '; + $result.='\vskip -1 mm\noindent'; + $result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt). + ' \strut '; $internal_counter++; } - if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { - $text =~ s/.*indent(.*)$/$1/; - $text = $1; + if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { + $text =~ s/\\item//m; $result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; $temp++; } @@ -629,9 +623,12 @@ sub displayfoils { } if ($target eq 'web') { - &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer, - [\@whichopt, - 'submissiongrading']); + my $data = [\@whichopt,'submissiongrading']; + my $questiontype; + if ($Apache::lonhomework::type eq 'randomizetry') { + $questiontype = $Apache::lonhomework::type, + } + &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,$data,$questiontype); } if ($target ne 'tex') { @@ -720,12 +717,12 @@ sub bubbles { $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { - $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; + $line.='\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; $head.='lr'; } else { $line=~s/\&\s*$//; - $result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; - $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';; + $result.='\vskip -1 mm\noindent\setlength{\tabcolsep}{2 mm}\renewcommand{\arraystretch}{1.25}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; + $line = '\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';; $head ='lr'; $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; } @@ -882,3 +879,64 @@ sub insert_drawoptionlist { 1; __END__ +=head1 NAME + +Apache::optionresponse.pm; + +=head1 SYNOPSIS + +Handles tags associated with showing a list of +options. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 HANDLER SUBROUTINE + +start_optionresponse() + +=head1 OTHER SUBROUTINES + +=over + +=item end_optionresponse() + +=item start_foilgroup() + +=item end_foilgroup() + +=item getfoilcounts() + +=item displayanswers() + +=item check_for_invalid() + +=item displayfoils() + +=item optionlist_correction() + +=item webbubbles() + +=item bubbles() + +=item start_conceptgroup() + +=item end_conceptgroup() + +=item insert_conceptgroup() + +=item start_foil() + +=item end_foil() + +=item start_drawoptionlist() + +=item end_drawoptionlist() + +=item insert_foil() + +=item insert_drawoptionlist() + +=back + +=cut