--- loncom/homework/optionresponse.pm 2005/06/22 12:03:23 1.129 +++ loncom/homework/optionresponse.pm 2010/04/27 14:11:17 1.164 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.129 2005/06/22 12:03:23 albertel Exp $ +# $Id: optionresponse.pm,v 1.164 2010/04/27 14:11:17 onken 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,7 +77,10 @@ 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::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); + } return $result; } @@ -113,7 +123,21 @@ sub start_foilgroup { Delete an Option: + ENDTABLE + $result.= ''.&Apache::edit::checked_arg('Print options:','texoptions', + [ ['nochoice','Don\'t show option list'] ] + ,$token).''; + $result.= ''; $result.= &Apache::edit::end_row(); $result.= &Apache::edit::start_spanning_row(); $result.= $insertlist.'
'; @@ -137,7 +161,9 @@ ENDTABLE } $optchanged=1; } - if ($optchanged) { + my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, + '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') { + if($env{'form.pdfFormFields'} ne 'yes') { $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} \begin{enumerate} '; + } else { + $result .= "\\\\"; + } } return $result; } @@ -169,15 +202,18 @@ 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); + } elsif ( $target eq 'analyze') { my @shown = &whichfoils($max,$randomize); &Apache::response::analyze_store_foilgroup(\@shown, @@ -223,9 +259,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 { @@ -266,12 +314,23 @@ sub end_foilgroup { } } } - &Apache::lonxml::increment_counter(&getfoilcounts($max)); + my $part_id = $Apache::inputtags::part; + my $response_id = $Apache::inputtags::response[-1]; + &Apache::lonxml::increment_counter(&getfoilcounts($max), + "$part_id.$response_id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); + } + } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); } if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { + if($env{'form.pdfFormFields'} ne 'yes') { $result .= '\end{enumerate}'; + } else { + $result .= "\\\\"; + } } &Apache::response::poprandomnumber(); return $result; @@ -295,17 +354,43 @@ sub whichfoils { } sub displayanswers { - my ($max,$randomize,@opt)=@_; - if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} - my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichopt = &whichfoils($max,$randomize); - my $result=&Apache::response::answer_header('optionresponse'); - foreach my $name (@whichopt) { - $result.=&Apache::response::answer_part('optionresponse', - $Apache::response::foilgroup{$name.'.value'}) - } - $result.=&Apache::response::answer_footer('optionresponse'); - return $result; + my ($max,$randomize,@opt)=@_; + if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} + my @names = @{ $Apache::response::foilgroup{'names'} }; + my @whichopt = &whichfoils($max,$randomize); + my $result; + if ($Apache::lonhomework::type eq 'exam') { + my $i = 0; + my %opt = map { ($_,$i++) } @opt; + + $i = 0; + my @alphabet = ('A'..'Z'); + foreach my $name (@whichopt) { + $result.=&Apache::response::answer_header('optionresponse',$i++); + $result.=&Apache::response::answer_part('optionresponse', + $alphabet[$opt{$Apache::response::foilgroup{$name.'.value'}}]); + $result.=&Apache::response::answer_part('optionresponse', + $Apache::response::foilgroup{$name.'.value'}); + $result.=&Apache::response::answer_footer('optionresponse'); + } + } else { + $result=&Apache::response::answer_header('optionresponse'); + foreach my $name (@whichopt) { + $result.=&Apache::response::answer_part('optionresponse', + $Apache::response::foilgroup{$name.'.value'}); + } + $result.=&Apache::response::answer_footer('optionresponse'); + } + 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 { @@ -330,7 +415,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; @@ -350,7 +435,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; @@ -376,6 +465,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*$/) { @@ -387,19 +481,63 @@ 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).''; } @@ -424,19 +562,24 @@ sub displayfoils { $texoptionlist = &optionlist_correction($TeXlayout,@opt); } if ($text=~//) { - $text=~s|| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |; + $text=~s|| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |g; } 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') { @@ -445,10 +588,24 @@ sub displayfoils { '\end{enumerate} \vskip -8 mm \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; } } } + + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer, + [\@whichopt, + 'submissiongrading']); + } + if ($target ne 'tex') { return $result.$break; } else { @@ -459,7 +616,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) { @@ -507,32 +664,39 @@ sub webbubbles { sub bubbles { - my ($ralphabet,$ropt,$response) = @_; + my ($ralphabet,$ropt,$response, $max_width) = @_; my @alphabet = @$ralphabet; my @opt = @$ropt; my ($result,$head,$line) =('','',''); my $number_of_bubbles = $#opt + 1; my $current_length = 0; my $textwidth; - if ($env{'form.textwidth'} ne '') { + if (defined($max_width)) { + $textwidth=$max_width; + &Apache::lonxml::debug("Max width passed in: $max_width"); + } elsif ($env{'form.textwidth'} ne '') { $env{'form.textwidth'}=~/(\d+)/; $textwidth=$1; + &Apache::lonxml::debug("Max width from form: $textwidth"); } else { $env{'form.textwidth'}=~/(\d*)\.?(\d*)/; $textwidth=$1.'.'.$2; + &Apache::lonxml::debug("Max width defaults? $textwidth"); } + &Apache::lonxml::debug("Final maxwidth: $textwidth"); for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { my $leftmargin; $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];} if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} + $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].'} & '; $head.='lr'; } else { $line=~s/\&\s*$//; - $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; + $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].'} & ';; $head ='lr'; $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; @@ -633,12 +797,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); @@ -664,25 +828,90 @@ sub end_foil { sub start_drawoptionlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - if ($target ne 'meta') { + if ($target !~ /^(?:meta|answer|modified|edit)$/) { return $token->[4]; } } sub end_drawoptionlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - if ($target ne 'meta') { + if ($target !~ /^(?:meta|answer|modified|edit)$/) { return $token->[2]; } } sub insert_foil { - return ' + return ' '; } + +sub insert_drawoptionlist { + return ''; +} 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 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.