version 1.37, 2004/09/03 18:35:52
|
version 1.44, 2005/01/31 22:00:40
|
Line 113 sub end_foilgroup {
|
Line 113 sub end_foilgroup {
|
my @shown = &whichfoils($max,$randomize); |
my @shown = &whichfoils($max,$randomize); |
&Apache::response::analyze_store_foilgroup(\@shown, |
&Apache::response::analyze_store_foilgroup(\@shown, |
['text','value','location']); |
['text','value','location']); |
|
my $part_id= |
|
"$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
$Apache::lonhomework::analyze{"$part_id.tol"}=$tol; |
} |
} |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
Line 192 sub check_response_order {
|
Line 195 sub check_response_order {
|
sub grade_response { |
sub grade_response { |
my ($max,$randomize,$tol)=@_; |
my ($max,$randomize,$tol)=@_; |
my (@whichfoils)=&whichfoils($max,$randomize); |
my (@whichfoils)=&whichfoils($max,$randomize); |
if (!defined($ENV{'form.submitted'})) { return; } |
if (!&Apache::response::submitted()) { return; } |
my %responsehash; |
my %responsehash; |
my %grade; |
my %grade; |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
# get response returns a=>0, when we want a=>1 |
my $response = &Apache::response::getresponse($temp,'A is 1'); |
my $response = &Apache::response::getresponse($temp)+1; |
|
my $value=shift(@correctorder); |
my $value=shift(@correctorder); |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
$responsehash{$name}=$response; |
$responsehash{$name}=$response; |
Line 236 sub grade_response {
|
Line 238 sub grade_response {
|
$ad='MISSING_ANSWER'; |
$ad='MISSING_ANSWER'; |
} |
} |
} |
} |
|
if ($Apache::lonhomework::type eq 'survey' && |
|
($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) { |
|
$ad='SUBMITTED'; |
|
} else { |
|
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
|
} |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$responsestr; |
$responsestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
&Apache::response::handle_previous(\%previous,$ad); |
&Apache::response::handle_previous(\%previous,$ad); |
} |
} |
Line 377 sub start_foil {
|
Line 384 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'; |
Line 409 sub end_foil {
|
Line 419 sub end_foil {
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
|
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { |
|
$text='\vskip 5mm $\triangleright$ '.$text; |
|
} |
if ($value ne 'unused') { |
if ($value ne 'unused') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if (!$name) { $name=$Apache::lonxml::curdepth; } |
if (!$name) { |
|
&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction."); |
|
$name=$Apache::lonxml::curdepth; |
|
} |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
Line 424 sub end_foil {
|
Line 440 sub end_foil {
|
&& !&Apache::response::showallfoils() ) { |
&& !&Apache::response::showallfoils() ) { |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::conceptgroup{"$name.text"} = $text; |
|
} |
|
$Apache::response::conceptgroup{"$name.location"} = $location; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.value"} = $value; |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
|
} else { |
|
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
|
$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::foilgroup{"$name.text"} = $text; |
|
} |
|
} |
|
$Apache::response::foilgroup{"$name.location"} = $location; |
$Apache::response::foilgroup{"$name.location"} = $location; |
} |
} |
} |
} |