--- loncom/homework/rankresponse.pm 2013/04/30 03:03:34 1.69
+++ loncom/homework/rankresponse.pm 2016/01/22 22:42:51 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# rank style response
#
-# $Id: rankresponse.pm,v 1.69 2013/04/30 03:03:34 raeburn Exp $
+# $Id: rankresponse.pm,v 1.73 2016/01/22 22:42:51 damieng Exp $
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -51,7 +51,8 @@ sub start_rankresponse {
$result=&Apache::response::meta_package_write('rankresponse');
} elsif ($target eq 'edit' ) {
$result.=&Apache::edit::start_table($token)
- .'
'.&Apache::lonxml::description($token).' | '
+ .'
'.&Apache::loncommon::insert_folding_button()
+ .&Apache::lonxml::description($token).' | '
.''.&mt('Delete?').' '
.&Apache::edit::deletelist($target,$token)
.' | '
@@ -335,8 +336,11 @@ sub format_prior_answer {
my %grading =&Apache::lonnet::str2hash($other_data->[1]);
my $output;
foreach my $name (@{ $foil_order }) {
- next if (!defined($lastresponse{$name}));
- $output .= '
'.$lastresponse{$name}.' |
';
+ if (defined($lastresponse{$name})) {
+ $output .= ''.&HTML::Entities::encode($lastresponse{$name},'<>&"').' |
';
+ } else {
+ $output .= ' |
';
+ }
}
return if (!defined($output));
$output =
@@ -358,7 +362,7 @@ sub displayfoils {
my $text=$Apache::response::foilgroup{$name.'.text'};
my $value=shift(@correctorder);
if ($target eq 'web') {
- $result.='
'.$value.': '.$text;
+ $result.=''.$value.': '.$text.'
';
} else {
$result.=' \strut\\\\\strut '.$value.':'.$text;
}
@@ -440,15 +444,17 @@ sub displayfoils {
}
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($target ne 'tex') {
+ $result .= '';
if ($Apache::lonhomework::type ne 'exam') {
- $result.='
'.$optionlist.$text."\n";
+ $result.=$optionlist.$text."\n";
} else {
- $result.='
'.$text."\n";
+ $result.=$text."\n";
}
if ($Apache::lonhomework::type eq 'exam') {
my @values=(1..scalar(@whichopt));
$result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt);
}
+ $result .= '
';
} else {
if ($Apache::lonhomework::type eq 'exam') {
my $itemlabel;