--- loncom/interface/statistics/lonstudentassessment.pm	2003/03/12 20:53:53	1.42
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/05/13 15:00:42	1.47
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.42 2003/03/12 20:53:53 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.47 2003/05/13 15:00:42 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -224,6 +224,7 @@ sub CreateInterface {
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>Sections</b></td>';
     $Str .= '<td align="center"><b>Student Data</b></td>';
+    $Str .= '<td align="center"><b>Enrollment Status</b></td>';
     $Str .= '<td align="center"><b>Sequences and Folders</b></td>';
     $Str .= '<td align="center"><b>Output Format</b></td>';
     $Str .= '</tr>'."\n";
@@ -242,6 +243,8 @@ sub CreateInterface {
     $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',
                                                       5,undef);
     $Str .= '</td><td>'."\n";
+    $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
+    $Str .= '</td><td>'."\n";
     $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
                                               $only_seq_with_assessments);
     $Str .= '</td><td>'."\n";
@@ -271,6 +274,15 @@ my @OutputOptions =
        show => 'all',
        show_links => 'yes',
        },
+     { name  => 'HTML, with all links',
+       value => 'html, with all links',
+       description => 'Output HTML with each symbol linked to the problem '.
+	   'which generated it.  '.
+           'This includes links for unattempted problems.',
+       mode => 'html',
+       show => 'all',
+       show_links => 'all',
+       },
      { name  => 'HTML, without links',
        value => 'html, without links',
        description => 'Output HTML.  By not including links, the size of the'.
@@ -381,7 +393,7 @@ sub OutputDescriptions {
 
 sub CreateAndParseOutputSelector {
     my $Str = '';
-    my $elementname = 'outputmode';
+    my $elementname = 'chartoutputmode';
     #
     # Format for output options is 'mode, restrictions';
     my $selected = 'html, with links';
@@ -822,6 +834,26 @@ sub excel_initialize {
         $rows_output += 1;
     }
     #
+    # Output a row for MAX
+    if ($show ne 'totals') {
+        $cols_output = 0;
+        foreach my $field (&get_student_fields_to_show()) {
+            if ($field eq 'username' || $field eq 'fullname' || 
+                $field eq 'id') {
+                $excel_sheet->write($rows_output,$cols_output++,'Maximum');
+            } else {
+                $excel_sheet->write($rows_output,$cols_output++,'');
+            }
+        }
+        #
+        # Add the Sequence Headers
+        foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+            $excel_sheet->write($rows_output,$cols_output++,
+                                $seq->{'num_assess_parts'});
+        }
+        $rows_output++;
+    }
+    #
     # Let the user know what we are doing
     my $studentcount = scalar(@Apache::lonstatistics::Students); 
     $r->print("<h1>Compiling Excel spreadsheet for ".
@@ -1126,6 +1158,9 @@ sub StudentPerformanceOnSequence {
                         $symbol = ' ';
                     }
                     $sum++;
+                } elsif (exists($resource_data->{'resource.'.
+                                                     $partnum.'.tries'})){
+                    $symbol = '.';
                 } else {
                     $symbol = ' ';
                 }
@@ -1138,7 +1173,8 @@ sub StudentPerformanceOnSequence {
                 }
             }
             #
-            if ($links eq 'yes' && $symbol ne ' ') {
+            if ( ($links eq 'yes' && $symbol ne ' ') ||
+                 ($links eq 'all')) {
                 $symbol = '<a href="/adm/grades'.
                     '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
                         '&student='.$student->{'username'}.