--- loncom/interface/statistics/lonstudentassessment.pm	2005/04/07 07:34:52	1.122
+++ loncom/interface/statistics/lonstudentassessment.pm	2005/04/19 01:28:25	1.124
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.122 2005/04/07 07:34:52 albertel Exp $
+# $Id: lonstudentassessment.pm,v 1.124 2005/04/19 01:28:25 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -710,6 +710,21 @@ sub html_initialize {
     $Str .= "<pre>";
     $r->print($Str);
     $r->rflush();
+    #
+    # Let the user know what we are doing
+    my $studentcount = scalar(@Apache::lonstatistics::Students); 
+    if ($env{'form.SelectedStudent'}) {
+        $studentcount = '1';
+    }
+    #
+    # Initialize progress window
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'HTML Chart Status',
+         'HTML Chart Progress', $studentcount,
+         'inline',undef,'Statistics','stats_status');
+    #
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+                                          'Processing first student');
     return;
 }
 
@@ -822,6 +837,7 @@ sub html_outputstudent {
     $r->print($Str);
     #
     $r->rflush();
+    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     return;
 }    
 
@@ -839,6 +855,7 @@ sub html_finish {
         }
     }
     $r->rflush();
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     undef($navmap);
     return;
 }
@@ -1043,7 +1060,7 @@ sub excel_initialize {
     my $sectionstring = '';
     my @Sections = &Apache::lonstatistics::get_selected_sections();
     $excel_sheet->write($header_row,$cols_output++,
-                        &Apache::lonstatistics::section_and_enrollment_description('plain text'),
+                        &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
                         $format->{'h3'});
     #
     # Put the date in there too
@@ -1797,7 +1814,7 @@ sub student_tries_on_sequence {
                 } elsif ($status eq 'incorrect_by_override') {
                     $symbol = '-';
                 } elsif ($status eq 'ungraded_attempted') {
-                    $symbol = '#';
+                    $symbol = 'u';
                 } elsif ($status eq 'incorrect_attempted' ||
                          $tries > 0)  {
                     $symbol = '.';
@@ -1914,13 +1931,19 @@ sub student_performance_on_sequence {
             if (length($symbol) > 1) {
                 $symbol = '*';
             }
-            if (exists($resource_data->{'resource.'.$part.'.solved'})) {
+            if (exists($resource_data->{'resource.'.$part.'.solved'}) &&
+                $resource_data->{'resource.'.$part.'.solved'} ne '') {
                 my $status = $resource_data->{'resource.'.$part.'.solved'};
                 if ($status eq 'excused') {
                     $symbol = 'x';
                     $max -= $weight; # Do not count 'excused' problems.
+                } elsif ($status eq 'ungraded_attempted') {
+                    $symbol = 'u';
                 }
                 $hasdata = 1;
+            } elsif ($resource_data->{'resource.'.$part.'.award'} eq 'DRAFT') {
+                $symbol = 'd';
+                $hasdata = 1;
             } elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){
                 # Unsolved.  Did they try?
                 if (exists($resource_data->{'resource.'.$part.'.tries'})){
@@ -1969,13 +1992,13 @@ problems.
 #######################################################
 sub CreateLegend {
     my $Str = "<p><pre>".
-              "   1  correct by student in 1 try\n".
-              "   7  correct by student in 7 tries\n".
+              " digit score or number of tries to get correct ".
               "   *  correct by student in more than 9 tries\n".
 	      "   +  correct by hand grading or override\n".
               "   -  incorrect by override\n".
 	      "   .  incorrect attempted\n".
-	      "   #  ungraded attempted\n".
+	      "   u  ungraded attempted\n".
+              "   d  draft answer saved but not submitted\n".
               "      not attempted (blank field)\n".
 	      "   x  excused".
               "</pre><p>";