version 1.236, 2009/01/15 18:31:23
|
version 1.240, 2010/10/14 04:02:07
|
Line 305 sub start_numericalresponse {
|
Line 305 sub start_numericalresponse {
|
my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); |
my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); |
&Apache::lonxml::debug("Got unit $hideunit for $partid $id"); |
&Apache::lonxml::debug("Got unit $hideunit for $partid $id"); |
#no way to enter units, with radio buttons |
#no way to enter units, with radio buttons |
if (lc($hideunit) eq "yes") { |
if ((lc($hideunit) eq "yes") && ($Apache::lonhomework::type ne 'exam')) { |
my $unit=&Apache::lonxml::get_param_var('unit',$parstack, |
my $unit=&Apache::lonxml::get_param_var('unit',$parstack, |
$safeeval); |
$safeeval); |
if ($unit =~ /\S/) { $result.=" (in $unit) "; } |
if ($unit =~ /\S/) { $result.=" (in $unit) "; } |
Line 533 sub end_numericalresponse {
|
Line 533 sub end_numericalresponse {
|
$Apache::inputtags::params{'sig'}); |
$Apache::inputtags::params{'sig'}); |
} |
} |
&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n"); |
&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n"); |
if ($Apache::lonhomework::type eq 'survey' && |
if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || |
($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || |
$ad eq 'EXACT_ANS')) { |
$ad eq 'EXACT_ANS')) { |
if ($Apache::lonhomework::type eq 'survey') { |
$ad='SUBMITTED'; |
$ad='SUBMITTED'; |
} |
} elsif ($Apache::lonhomework::type eq 'surveycred') { |
|
$ad='SUBMITTED_CREDIT'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$ad='ANONYMOUS'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurveycred') { |
|
$ad='ANONYMOUS_CREDIT'; |
|
} |
|
} |
&Apache::response::handle_previous(\%previous,$ad); |
&Apache::response::handle_previous(\%previous,$ad); |
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg; |
$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg; |
Line 585 sub end_numericalresponse {
|
Line 592 sub end_numericalresponse {
|
&get_table_sizes($number_of_bubbles,$bubble_display); |
&get_table_sizes($number_of_bubbles,$bubble_display); |
my $j=0; |
my $j=0; |
my $cou=0; |
my $cou=0; |
$result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'; |
$result.='\vskip 2mm \noindent '; |
|
$result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm '; |
|
|
for (my $i=0;$i<$number_of_tables;$i++) { |
for (my $i=0;$i<$number_of_tables;$i++) { |
$result.='\vskip -1 mm \noindent \setlength{\tabcolsep}{2 mm}\begin{tabular}{'; |
if ($i == 0) { |
|
$result .= '\vskip -1mm '; |
|
} else { |
|
$result .= '\vskip 1mm '; |
|
} |
|
$result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{'; |
for (my $ind=0;$ind<$table_range[$j];$ind++) { |
for (my $ind=0;$ind<$table_range[$j];$ind++) { |
$result.='p{3 mm}p{'.$celllength.' mm}'; |
$result.='p{3 mm}p{'.$celllength.' mm}'; |
} |
} |
Line 600 sub end_numericalresponse {
|
Line 614 sub end_numericalresponse {
|
$j++; |
$j++; |
$result.='\\\\\end{tabular}\vskip 0 mm '; |
$result.='\\\\\end{tabular}\vskip 0 mm '; |
} |
} |
$result.='\end{enumerate}'; |
|
} else { |
} else { |
$increment = &Apache::response::repetition(); |
$increment = &Apache::response::repetition(); |
} |
} |
Line 1181 sub end_stringresponse {
|
Line 1194 sub end_stringresponse {
|
push(@names,$name); |
push(@names,$name); |
&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n"); |
&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n"); |
} |
} |
my ($ad, $msg, $name) = |
($ad, $msg, my $name) = |
&Apache::inputtags::finalizeawards(\@final_awards, |
&Apache::inputtags::finalizeawards(\@final_awards, |
\@final_msgs, |
\@final_msgs, |
\@names,1); |
\@names,1); |
} |
} |
if ($Apache::lonhomework::type eq 'survey' && |
if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || |
($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || |
$ad eq 'EXACT_ANS')) { |
$ad eq 'EXACT_ANS')) { |
if ($Apache::lonhomework::type eq 'survey') { |
$ad='SUBMITTED'; |
$ad='SUBMITTED'; |
} |
} elsif ($Apache::lonhomework::type eq 'surveycred') { |
|
$ad='SUBMITTED_CREDIT'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$ad='ANONYMOUS'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurveycred') { |
|
$ad='ANONYMOUS_CREDIT'; |
|
} |
|
} |
&Apache::response::handle_previous(\%previous,$ad); |
&Apache::response::handle_previous(\%previous,$ad); |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg; |
$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg; |