version 1.44, 2004/07/08 17:51:31
|
version 1.47, 2004/10/21 06:35:57
|
Line 350 sub grade_response {
|
Line 350 sub grade_response {
|
$itemstr; |
$itemstr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$gradestr; |
$gradestr; |
if (!$Apache::lonhomework::scantronmode) { |
if ($Apache::lonhomework::type eq 'survey') { |
|
if ($ignored == 0) { |
|
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; |
|
&Apache::response::handle_previous(\%previous,$ad); |
|
} elsif ($wrong==0 && $right==0) { |
|
} else { |
|
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER'; |
|
&Apache::response::handle_previous(\%previous,$ad); |
|
} |
|
} elsif (!$Apache::lonhomework::scantronmode) { |
my $ad; |
my $ad; |
if ($wrong==0 && $ignored==0) { |
if ($wrong==0 && $ignored==0) { |
$ad='EXACT_ANS'; |
$ad='EXACT_ANS'; |
Line 460 sub displayfoils {
|
Line 469 sub displayfoils {
|
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$question.='<br />'.$optionlist.$text."\n"; |
$question.="<br />\n".$optionlist.$text; |
} else { |
} else { |
$question.='<br />'.$text."\n"; |
$question.="<br />\n".$text; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
my @blank; |
my @blank; |
Line 488 sub displayfoils {
|
Line 497 sub displayfoils {
|
$result=$question.$result; |
$result=$question.$result; |
} elsif ($result=&itemdisplay('right')) { |
} elsif ($result=&itemdisplay('right')) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result='<table><tr><td>'.$question.'</td><td>'.$result. |
#remove the first <br /> |
'</td></tr></table>'; |
$question=~s|<br />||; |
|
$result='<table><tr><td valign="top">'.$question. |
|
'</td><td valign="top">'.$result.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my ($lefttabsize,$righttabsize)=(0,0); |
my ($lefttabsize,$righttabsize)=(0,0); |
Line 508 sub displayfoils {
|
Line 519 sub displayfoils {
|
} |
} |
} elsif ($result=&itemdisplay('left')) { |
} elsif ($result=&itemdisplay('left')) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result='<table><tr><td>'.$result.'</td><td>'.$question. |
#remove the first <br /> |
'</td></tr></table>'; |
$question=~s|<br />||; |
|
$result='<table><tr><td valign="top">'.$result. |
|
'</td><td valign="top">'.$question.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my ($lefttabsize,$righttabsize)=(0,0); |
my ($lefttabsize,$righttabsize)=(0,0); |
Line 587 sub start_foil {
|
Line 600 sub start_foil {
|
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
|
if ($target eq 'analyze') { |
|
&Apache::response::check_if_computed($token,$parstack,$safeeval,'value'); |
|
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
my $level='-2'; |
my $level='-2'; |