--- loncom/interface/statistics/lonstudentsubmissions.pm	2012/05/12 03:52:02	1.68.2.1
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2014/02/03 16:32:34	1.70
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.68.2.1 2012/05/12 03:52:02 raeburn Exp $
+# $Id: lonstudentsubmissions.pm,v 1.70 2014/02/03 16:32:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ use strict;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonquickgrades();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
@@ -63,6 +64,7 @@ sub BuildStudentSubmissionsPage {
     &Apache::lonstatistics::PrepareClasslist();
     #
     $r->print( &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -730,7 +732,22 @@ sub html_non_essay_results {
             }
         }
     } else {
-        @values = map { $response->{$_}; } @$headers;
+        foreach my $original_header (@$headers) {
+            if ($original_header eq 'Time') {
+                push(@values,&Apache::lonlocal::locallocaltime($response->{$original_header}));
+            } elsif (($original_header eq 'Submission') &&
+                    !($resptype =~ /^(radiobutton|option|match|rank)$/)) {
+                # encode all submissions which have not been encoded above
+                push(@values,&HTML::Entities::encode($response->{$original_header},'<>&"'));
+            } elsif (($original_header eq 'Correct') &&
+                     ($resptype eq 'radiobutton')) {
+                # encode foil separators
+                push(@values,&HTML::Entities::encode($response->{$original_header},'&'));
+            } else {
+                # A normal column
+                push(@values,$response->{$original_header});
+            }
+        }
     }
     my $td = '<td valign="top">';
     my $str = $td.join('</td>'.$td,@values).'</td>';
@@ -1236,7 +1253,7 @@ sub prepare_csv_output {
 sub csv_format_item {
     my ($item,$type) = @_;
     if ($type eq 'Time') {
-        $item = localtime($item);
+        $item = &Apache::lonlocal::locallocaltime($item);
     }
     $item =&Apache::loncommon::csv_translate($item); 
     return $item;