version 1.226, 2011/09/13 21:42:58
|
version 1.228, 2011/11/29 13:24:38
|
Line 53 package Apache::response;
|
Line 53 package Apache::response;
|
use strict; |
use strict; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::inputtags(); |
use Apache::lonmaxima(); |
use Apache::lonmaxima(); |
use Apache::lonr(); |
use Apache::lonr(); |
|
|
Line 494 sub end_customresponse {
|
Line 495 sub end_customresponse {
|
} |
} |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::increment_counter(&Apache::response::repetition(), |
my $repetition = &repetition(); |
"$part.$id"); |
&Apache::lonxml::increment_counter($repetition,"$part.$id"); |
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
$Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse'; |
$Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse'; |
&Apache::lonhomework::set_bubble_lines(); |
&Apache::lonhomework::set_bubble_lines(); |
Line 1034 sub getresponse {
|
Line 1035 sub getresponse {
|
|
|
=item &repetition(); |
=item &repetition(); |
|
|
Returns the number of lines that are required to encode the weight. |
In scalar context: |
|
|
|
returns: the number of lines that are required to encode the weight. |
(Default is for 10 bubbles per bubblesheet item; other (integer) |
(Default is for 10 bubbles per bubblesheet item; other (integer) |
values can be specified by using a custom Bubblesheet format file |
values can be specified by using a custom Bubblesheet format file |
with an eighteenth entry (BubblesPerRow) set to the integer |
with an eighteenth entry (BubblesPerRow) set to the integer |
appropriate for the bubblesheets which will be used to assign weights. |
appropriate for the bubblesheets which will be used to assign weights. |
|
|
|
In array context: |
|
|
|
returns: number of lines required to encode weight, and bubbles/line. |
|
|
=cut |
=cut |
|
|
sub repetition { |
sub repetition { |
Line 1053 sub repetition {
|
Line 1060 sub repetition {
|
} else { |
} else { |
$bubbles_per_row = 10; |
$bubbles_per_row = 10; |
} |
} |
my $repetition = int($weight/$bubbles_per_row); |
my $denominator = $bubbles_per_row; |
if ($weight % $bubbles_per_row != 0) { $repetition++; } |
if (($env{'form.scantron_lastbubblepoints'} == 0) && |
|
($bubbles_per_row > 1)) { |
|
$denominator = $bubbles_per_row - 1; |
|
} |
|
my $repetition = int($weight/$denominator); |
|
if ($weight % $denominator != 0) { $repetition++; } |
|
if (wantarray) { |
|
return ($repetition,$bubbles_per_row); |
|
} |
return $repetition; |
return $repetition; |
|
|
} |
} |
|
|
=pod |
=pod |
Line 1085 Arguments
|
Line 1101 Arguments
|
sub scored_response { |
sub scored_response { |
my ($part,$id)=@_; |
my ($part,$id)=@_; |
my $repetition=&repetition(); |
my $repetition=&repetition(); |
|
my $bubbles_per_row; |
|
if (($env{'form.bubbles_per_row'} =~ /^\d+$/) && |
|
($env{'form.bubbles_per_row'} > 0)) { |
|
$bubbles_per_row = $env{'form.bubbles_per_row'}; |
|
} else { |
|
$bubbles_per_row = 10; |
|
} |
my $score=0; |
my $score=0; |
for (my $i=0;$i<$repetition;$i++) { |
for (my $i=0;$i<$repetition;$i++) { |
# A is 1, B is 2, etc. (get response return 0-9 and then we add 1) |
# A is 1, B is 2, etc. |
my $increase=&Apache::response::getresponse($i+1); |
my $increase=&Apache::response::getresponse($i+1); |
if ($increase ne '') { $score+=$increase+1; } |
unless (($increase == $bubbles_per_row-1) && |
|
($env{'form.scantron_lastbubblepoints'} == 0)) { |
|
# (get response return 0-9 and then we add 1) |
|
if ($increase ne '') { |
|
$score+=$increase+1; |
|
} |
|
} |
} |
} |
my $weight = &Apache::lonnet::EXT("resource.$part.weight"); |
my $weight = &Apache::lonnet::EXT("resource.$part.weight"); |
if (!defined($weight) || $weight eq '' || $weight eq 0) { $weight = 1; } |
if (!defined($weight) || $weight eq '' || $weight eq 0) { $weight = 1; } |
Line 1153 sub whichorder {
|
Line 1182 sub whichorder {
|
|
|
sub show_answer { |
sub show_answer { |
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $award = $Apache::lonhomework::history{"resource.$part.awarded"}; |
my $award = $Apache::lonhomework::history{"resource.$part.solved"}; |
my $status = $Apache::inputtags::status[-1]; |
my $status = $Apache::inputtags::status[-1]; |
return ( ($award ==1 |
my $canshow = 0; |
&& &Apache::lonhomework::show_problem_status()) |
if ($award =~ /^correct/) { |
|| $status eq "SHOW_ANSWER"); |
if ((&Apache::inputtags::grading_is_nonlenient($part)) || |
|
($Apache::lonhomework::history{"resource.$part.awarded"} == 1)) { |
|
$canshow = 1; |
|
} |
|
} |
|
return (($canshow && &Apache::lonhomework::show_problem_status()) |
|
|| $status eq "SHOW_ANSWER"); |
} |
} |
|
|
sub analyze_store_foilgroup { |
sub analyze_store_foilgroup { |