--- loncom/homework/caparesponse/caparesponse.pm 2004/06/02 21:23:21 1.145
+++ loncom/homework/caparesponse/caparesponse.pm 2004/06/30 17:32:46 1.151
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.145 2004/06/02 21:23:21 albertel Exp $
+# $Id: caparesponse.pm,v 1.151 2004/06/30 17:32:46 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,7 +45,8 @@ sub start_numericalresponse {
$result.=&Apache::edit::text_arg('Answer:','answer',$token);
if ($token->[1] eq 'numericalresponse') {
$result.=&Apache::edit::text_arg('Incorrect Answers:','incorrect',
- $token);
+ $token).
+ &Apache::loncommon::help_open_topic('numerical_wrong_answers');
$result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
&Apache::loncommon::help_open_topic('Physical_Units');
$result.=&Apache::edit::text_arg('Format:','format',$token,4).
@@ -86,6 +87,39 @@ sub start_numericalresponse {
$safeeval);
if ($unit =~ /\S/) { $result.=" (in $unit) "; }
}
+ if ( &Apache::response::show_answer() ) {
+ my $answertxt;
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+ $safeeval);
+ my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
+ $safeeval);
+ my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
+ $safeeval);
+ for (my $i=0; $i <= $#answers; $i++) {
+ my $answer=$answers[$i];
+ my $format;
+ if ($#formats > 0) {
+ $format=$formats[$i];
+ } else {
+ $format=$formats[0];
+ }
+ my $formatted;
+ if ((defined($format)) && ($format ne '')) {
+ $format=~s/e/E/g;
+ &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
+ $formatted=sprintf('%.'.$format,$answer).',';
+ } else {
+ &Apache::lonxml::debug("no format answer :$answer:");
+ $formatted="$answer,";
+ }
+ $answertxt.=$formatted;
+ }
+ chop $answertxt;
+ if ($target eq 'web') {
+ $answertxt.=" $unit ";
+ }
+ $Apache::inputtags::answertxt{$id}=$answertxt;
+ }
}
return $result;
}
@@ -185,42 +219,6 @@ sub end_numericalresponse {
$safeeval);
my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
my $status = $Apache::inputtags::status['-1'];
- if ( &Apache::response::show_answer() ) {
- my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
- $safeeval);
- my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
- $safeeval);
- if ($target eq 'web') {
- $result="
".&mt('The correct answer is')." ";
- }
- for (my $i=0; $i <= $#answers; $i++) {
- my $answer=$answers[$i];
- my $format;
- if ($#formats > 0) {
- $format=$formats[$i];
- } else {
- $format=$formats[0];
- }
- my $formatted;
- if ((defined($format)) && ($format ne '')) {
- $format=~s/e/E/g;
- &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
- $formatted=sprintf('%.'.$format,$answer).',';
- } else {
- &Apache::lonxml::debug("no format answer :$answer:");
- $formatted="$answer,";
- }
- if ($target eq 'tex') {
- $formatted='';
- #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
- }
- $result.=$formatted;
- }
- chop $result;
- if ($target eq 'web') {
- $result.=" $unit.
";
- }
- }
if ($Apache::lonhomework::type eq 'exam') {
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
@@ -414,7 +412,9 @@ sub get_table_sizes {
$textwidth=$1.'.'.$2;
}
my $bubbles_per_line=int($textwidth/$cell_width);
- if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}
+ if ($bubbles_per_line > $number_of_bubbles) {
+ $bubbles_per_line=$number_of_bubbles;
+ }elsif (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}
my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
my @table_range = ();
for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
@@ -520,6 +520,10 @@ sub get_tolrange {
sub get_sigrange {
my ($sig)=@_;
&Apache::lonxml::debug("Got a sig of :$sig:");
+ my $courseid=$ENV{'request.course.id'};
+ if (lc($ENV{"course.$courseid.disablesigfigs"}) eq 'yes') {
+ return (15,0);
+ }
my $sig_lbound;
my $sig_ubound;
if ($sig eq '') {
@@ -551,9 +555,7 @@ sub start_stringresponse {
my $result;
my $id = &Apache::response::start_response($parstack,$safeeval);
if ($target eq 'meta') {
- &Apache::response::start_response($parstack,$safeeval);
$result=&Apache::response::meta_package_write('stringresponse');
- &Apache::response::end_response();
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Answer:','answer',$token);
@@ -561,18 +563,21 @@ sub start_stringresponse {
[['cs','Case Sensitive'],['ci','Case Insensitive'],
['mc','Case Insensitive, Any Order'],
['re','Regular Expression']],$token);
- $result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',
- [['inline','Inline']],$token);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
- my $constructtag;
- $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'answer',
- 'type','answerdisplay');
- if ($constructtag) {
- $result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
- }
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'answer',
+ 'type','answerdisplay');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result.=&Apache::edit::handle_insert();
+ }
+ } elsif ($target eq 'web') {
+ if ( &Apache::response::show_answer() ) {
+ $Apache::inputtags::answertxt{$id}=
+ &Apache::lonxml::get_param('answer',$parstack,$safeeval);
+ }
} elsif ($target eq 'answer' || $target eq 'grade') {
&Apache::response::reset_params();
}
@@ -648,13 +653,6 @@ sub end_stringresponse {
} elsif ($target eq 'web' || $target eq 'tex') {
my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
my $status = $Apache::inputtags::status['-1'];
- if ( &Apache::response::show_answer() ) {
- if ($target eq 'web') {
- $result=($answerdisplay eq 'inline'?'':"
".&mt('The correct answer is')." ")
- .$answer;
-# join(', ',@answers).".
";
- }
- }
if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
$result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
$increment = &Apache::response::repetition();