--- loncom/interface/statistics/lonstudentsubmissions.pm	2004/08/31 15:22:51	1.13
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2004/08/31 15:52:13	1.14
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.13 2004/08/31 15:22:51 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.14 2004/08/31 15:52:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -182,16 +182,10 @@ sub prepare_excel_output {
     if ($ENV{'form.correctans'} eq 'true') { push(@Columns,'correct'); }
     push(@Columns,'grading');
     push(@Columns,'awarded');
+    my $awarded_col = $#Columns;
     push(@Columns,'weight');
+    my $weight_col  = $#Columns;
     push(@Columns,'score');
-    my ($awarded_col,$weight_col);
-    if ($ENV{'form.correctans'} eq 'true') {
-        $awarded_col = 7;
-        $weight_col  = 8;
-    } else {
-        $awarded_col = 6;
-        $weight_col  = 7;
-    }
     #
     # Create excel worksheet
     my $filename = '/prtspool/'.