--- loncom/homework/optionresponse.pm 2008/09/11 17:38:14 1.152
+++ loncom/homework/optionresponse.pm 2010/02/05 21:38:41 1.161
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.152 2008/09/11 17:38:14 onken Exp $
+# $Id: optionresponse.pm,v 1.161 2010/02/05 21:38:41 www 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).
- "
'.&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,
@@ -183,13 +190,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);
@@ -352,6 +360,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;
@@ -374,7 +391,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;
@@ -420,6 +437,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*$/) {
@@ -432,7 +454,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);
}
@@ -440,13 +463,15 @@ 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') {
$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') {
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
} else {
$optionlist.="\n";
@@ -455,10 +480,34 @@ sub displayfoils {
}
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $optionlist=' |