version 1.31, 2003/11/15 06:28:02
|
version 1.34, 2004/02/09 19:43:22
|
Line 306 sub grade_response {
|
Line 306 sub grade_response {
|
if (!defined($ENV{'form.submitted'})) { return; } |
if (!defined($ENV{'form.submitted'})) { return; } |
my %responsehash; |
my %responsehash; |
my %grade; |
my %grade; |
my ($temp,$right,$wrong,$ignored)=(0,0,0,0); |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my %letter_name_map; |
my %letter_name_map; |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
%letter_name_map= |
%letter_name_map= |
Line 314 sub grade_response {
|
Line 314 sub grade_response {
|
} |
} |
my @items; |
my @items; |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $response = &Apache::response::getresponse($temp); |
my $response = &Apache::response::getresponse($temp,'letter'); |
push(@items,$response); |
push(@items,$response); |
my $responsename = $letter_name_map{$response}; |
my $responsename = $letter_name_map{$response}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
$responsehash{$name}=$responsename; |
$responsehash{$name}=$responsename; |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
&Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n"); |
if ($value eq $responsename) { |
if ($value eq $responsename) { |
$grade{$name}='1'; $right++; |
$grade{$name}='1'; $right++; |
} else { |
} else { |
Line 338 sub grade_response {
|
Line 338 sub grade_response {
|
my $gradestr =&Apache::lonnet::hash2str(%grade); |
my $gradestr =&Apache::lonnet::hash2str(%grade); |
my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); |
my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); |
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); |
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); |
my $ad; |
|
if ($wrong==0 && $ignored==0) { |
|
$ad='EXACT_ANS'; |
|
} elsif ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
if ($ignored==0) { |
|
$ad='INCORRECT'; |
|
} else { |
|
$ad='MISSING_ANSWER'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$responsestr; |
$responsestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissionitems"}= |
$Apache::lonhomework::results{"resource.$part.$id.submissionitems"}= |
$itemstr; |
$itemstr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$gradestr; |
$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
if (!$Apache::lonhomework::scantronmode) { |
&Apache::response::handle_previous(\%previous,$ad); |
my $ad; |
|
if ($wrong==0 && $ignored==0) { |
|
$ad='EXACT_ANS'; |
|
} elsif ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
if ($ignored==0) { |
|
$ad='INCORRECT'; |
|
} else { |
|
$ad='MISSING_ANSWER'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
|
&Apache::response::handle_previous(\%previous,$ad); |
|
} else { |
|
my $ad; |
|
if ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
$ad='ASSIGNED_SCORE'; |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
|
$ad; |
|
$Apache::lonhomework::results{"resource.$part.$id.awarded"}= |
|
$right/(scalar(@whichopt)); |
|
$Apache::lonhomework::results{"resource.$part.$id.numfoils"}= |
|
scalar(@whichopt); |
|
} |
|
} |
} |
} |
|
|
sub itemdisplay { |
sub itemdisplay { |
Line 465 sub displayfoils {
|
Line 480 sub displayfoils {
|
} elsif ($result=&itemdisplay('bottom')) { |
} elsif ($result=&itemdisplay('bottom')) { |
$result=$question.$result; |
$result=$question.$result; |
} elsif ($result=&itemdisplay('right')) { |
} elsif ($result=&itemdisplay('right')) { |
$result='<table><tr><td>'.$question.'</td><td>'.$result. |
if ($target ne 'tex') { |
'</td></tr></table>'; |
$result='<table><tr><td>'.$question.'</td><td>'.$result. |
|
'</td></tr></table>'; |
|
} else { |
|
$result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}'; |
|
} |
} elsif ($result=&itemdisplay('left')) { |
} elsif ($result=&itemdisplay('left')) { |
$result='<table><tr><td>'.$result.'</td><td>'.$question. |
if ($target ne 'tex') { |
'</td></tr></table>'; |
$result='<table><tr><td>'.$result.'</td><td>'.$question. |
|
'</td></tr></table>'; |
|
} else { |
|
$result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}'; |
|
} |
} |
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
return $result; |
return $result; |