version 1.66, 2011/09/13 21:42:58
|
version 1.71, 2014/05/05 17:40:54
|
Line 186 sub get_correct_order {
|
Line 186 sub get_correct_order {
|
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,$randomize,$tol,@opt)=@_; |
my ($max,$randomize,$tol,@opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
my @names; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { |
|
@names = @{ $Apache::response::foilgroup{'names'} }; |
|
} |
|
return if (!@names); |
my @whichfoils = &whichfoils($max,$randomize); |
my @whichfoils = &whichfoils($max,$randomize); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my $result; |
my $result; |
Line 332 sub format_prior_answer {
|
Line 335 sub format_prior_answer {
|
my %grading =&Apache::lonnet::str2hash($other_data->[1]); |
my %grading =&Apache::lonnet::str2hash($other_data->[1]); |
my $output; |
my $output; |
foreach my $name (@{ $foil_order }) { |
foreach my $name (@{ $foil_order }) { |
next if (!defined($lastresponse{$name})); |
if (defined($lastresponse{$name})) { |
$output .= '<tr><td>'.$lastresponse{$name}.'</td></tr>'; |
$output .= '<tr><td>'.&HTML::Entities::encode($lastresponse{$name},'<>&"').'</td></tr>'; |
|
} else { |
|
$output .= '<tr><td> </td></tr>'; |
|
} |
} |
} |
return if (!defined($output)); |
return if (!defined($output)); |
$output = |
$output = |
Line 374 sub displayfoils {
|
Line 380 sub displayfoils {
|
$newvariation = 1; |
$newvariation = 1; |
} |
} |
} |
} |
unless (((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) || $newvariation) { |
unless ($newvariation) { |
$lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) || |
|
(($env{'form.grade_username'} eq $env{'user.name'}) && |
|
($env{'form.grade_domain'} eq $env{'user.domain'}))) { |
|
$lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
|
} else { |
|
unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || |
|
($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) { |
|
$lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
|
} |
|
} |
} |
} |
my %lastresponse=&Apache::lonnet::str2hash($lastresponse); |
my %lastresponse=&Apache::lonnet::str2hash($lastresponse); |
my @alp = splice @alphabet, 0, $#whichopt + 1; |
my @alp = splice @alphabet, 0, $#whichopt + 1; |
Line 593 sub end_foil {
|
Line 608 sub end_foil {
|
$name=$Apache::lonxml::curdepth; |
$name=$Apache::lonxml::curdepth; |
} |
} |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
if ($name eq "0") { |
|
&Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.','<b><tt>'.$name.'</tt></b>')); |
|
} |
|
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>')); |
&Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>')); |
} |
} |