| '.&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 +72,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;
}
@@ -183,6 +188,7 @@ sub end_foilgroup {
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
+ $Apache::lonxml::post_evaluate=0;
} elsif ( $target eq 'answer') {
$result.=&displayanswers($max,$randomize,@opt);
@@ -274,7 +280,14 @@ 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();
}
@@ -422,7 +435,8 @@ sub displayfoils {
}
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $optionlist='\n";
} else {
@@ -474,6 +488,13 @@ sub displayfoils {
}
}
}
+
+ 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 {
@@ -484,7 +505,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) {
@@ -532,25 +553,32 @@ 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].'} & ';
@@ -658,12 +686,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);
@@ -689,25 +717,29 @@ sub end_foil {
sub start_drawoptionlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if (($target ne 'meta') && ($target ne 'answer')) {
+ if ($target !~ /^(?:meta|answer|modified|edit)$/) {
return $token->[4];
}
}
sub end_drawoptionlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if (($target ne 'meta') && ($target ne 'answer')) {
+ if ($target !~ /^(?:meta|answer|modified|edit)$/) {
return $token->[2];
}
}
sub insert_foil {
- return '
+ return '
';
}
+
+sub insert_drawoptionlist {
+ return '';
+}
1;
__END__
|