--- loncom/homework/optionresponse.pm 2007/10/08 09:22:50 1.146 +++ loncom/homework/optionresponse.pm 2010/09/01 21:29:51 1.171 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.146 2007/10/08 09:22:50 foxr Exp $ +# $Id: optionresponse.pm,v 1.171 2010/09/01 21:29:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,6 +25,11 @@ # # http://www.lon-capa.org/ # + + + + + package Apache::optionresponse; use strict; use Apache::response(); @@ -45,21 +50,23 @@ sub start_optionresponse { %Apache::hint::option=(); undef(%Apache::response::foilnames); if ($target eq 'edit') { - $result.=&Apache::edit::start_table($token). - "Multiple Option Response Question ". - &Apache::loncommon::help_open_topic('Option_Response_Problems')."Delete:". - &Apache::edit::deletelist($target,$token) - ." ". - &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - "\n"; + $result.=&Apache::edit::start_table($token) + .''.&mt('Multiple Option Response Question').' ' + .&Apache::loncommon::help_open_topic('Option_Response_Problems')."" + .''.&mt('Delete?').' ' + .&Apache::edit::deletelist($target,$token) + .'' + ." " + .&Apache::edit::end_row() + .&Apache::edit::start_spanning_row() + ."\n"; $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max', $token,'4'). - &Apache::edit::select_arg('Randomize Foil Order','randomize', + &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, @@ -70,8 +77,9 @@ sub start_optionresponse { $result=&Apache::response::meta_package_write('optionresponse'); } elsif ($target eq 'analyze') { my $part_id="$Apache::inputtags::part.$id"; + $Apache::lonhomework::analyze{"$part_id.type"} = 'optionresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); - push (@{ $Apache::lonhomeowrk::analyze{"$part_id.bubble_lines"} }, 1); + push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); } return $result; @@ -115,10 +123,21 @@ 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::end_row(); $result.= &Apache::edit::start_spanning_row(); $result.= $insertlist.'
'; @@ -143,7 +162,7 @@ ENDTABLE $optchanged=1; } my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, - ('texoptions')); + 'texoptions','checkboxvalue'); if ($optchanged || $rebuildtag ) { $result = "[2]{'texoptions'}.'" '; + $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') { - $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} - \begin{enumerate} '; + if($env{'form.pdfFormFields'} ne 'yes') { + $result .= ' \begin{itemize} '; + } else { + $result .= "\\\\"; + } } return $result; } @@ -178,13 +201,14 @@ sub end_foilgroup { my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval, -2,0); + my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$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,@opt); $Apache::lonxml::post_evaluate=0; } elsif ( $target eq 'answer') { $result.=&displayanswers($max,$randomize,@opt); @@ -234,9 +258,21 @@ sub end_foilgroup { $responsestr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; - if ($Apache::lonhomework::type eq 'survey') { + 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 { @@ -277,8 +313,10 @@ sub end_foilgroup { } } } + my $part_id = $Apache::inputtags::part; + my $response_id = $Apache::inputtags::response[-1]; &Apache::lonxml::increment_counter(&getfoilcounts($max), - $Apache::inputtags::part); + "$part_id.$response_id"); if ($target eq 'analyze') { &Apache::lonhomework::set_bubble_lines(); } @@ -287,7 +325,11 @@ sub end_foilgroup { $result.=&Apache::edit::end_table(); } if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { - $result .= '\end{enumerate}'; + if($env{'form.pdfFormFields'} ne 'yes') { + $result .= '\end{itemize}'; + } else { + $result .= "\\\\"; + } } &Apache::response::poprandomnumber(); return $result; @@ -341,6 +383,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; @@ -363,7 +414,7 @@ sub check_for_invalid { } sub displayfoils { - my ($target,$max,$randomize,$TeXlayout,@opt)=@_; + my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,@opt)=@_; if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} my @names = @{ $Apache::response::foilgroup{'names'} }; my @truelist; @@ -383,7 +434,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; @@ -396,7 +451,9 @@ sub displayfoils { $text=''.$value.': '.$text; } } else { - $text='•'.$text; + if (@whichopt > 1) { + $text='•'.$text; + } } $result.=$text."\n"; } @@ -409,6 +466,11 @@ sub displayfoils { my $temp=1; my %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.='
'.&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*$/) { @@ -420,26 +482,71 @@ sub displayfoils { } my $lastopt=$lastresponse{$name}; my $optionlist="\n"; + + 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); + } + foreach my $option (@opt) { my $escopt=&HTML::Entities::encode($option,'\'"&<>'); - if ($option eq $lastopt) { - $optionlist.="\n"; - } else { - $optionlist.="\n"; - } + if ($option eq $lastopt) { + 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' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { + $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); + } else { + $optionlist.="\n"; + } + } } 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') { @@ -464,21 +571,33 @@ sub displayfoils { if ($text=~m/\\item /) { if ($Apache::lonhomework::type eq 'exam') { $text=~s/\\item/\\vskip 2 mm/; - } - $result.= $texoptionlist.$text; - } else { + } elsif ($env{'form.pdfFormFields'} ne 'yes') { + $result.= $texoptionlist.$text; + } + } else { if ($Apache::lonhomework::type eq 'exam') { $result.= $texoptionlist.' '.$text; - } else { - if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;} + } elsif ($env{'form.pdfFormFields'} ne 'yes') { + if ($text=~/\S/) { + $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text; + } else { + $result.= $texoptionlist; + } } } 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' + && $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++; + } $displayoptionintex=0; } } @@ -500,7 +619,7 @@ sub displayfoils { sub optionlist_correction { my ($TeXlayout,@options) = @_; - my $texoptionlist='\\item [] Choices: '; + my $texoptionlist='\\item [] '.&mt('Choices:').' '; if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';} if (scalar(@options) > 0) { foreach my $option (@options) { @@ -576,12 +695,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; } @@ -681,12 +800,12 @@ sub end_foil { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); if ($name eq "") { - &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); + &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); $name=$Apache::lonxml::curdepth; } &Apache::lonxml::debug("Using a name of :$name:"); if (defined($Apache::response::foilnames{$name})) { - &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name)); + &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",''.$name.'')); } $Apache::response::foilnames{$name}++; my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval); @@ -738,3 +857,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