--- loncom/interface/statistics/lonstudentassessment.pm	2002/10/21 00:15:13	1.14
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/02/28 21:19:00	1.30
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
-# (Publication Handler
 #
-# $Id: lonstudentassessment.pm,v 1.14 2002/10/21 00:15:13 minaeibi Exp $
+# $Id: lonstudentassessment.pm,v 1.30 2003/02/28 21:19:00 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,584 +24,535 @@
 # http://www.lon-capa.org/
 #
 # (Navigate problems for statistical reports
-# YEAR=2001
-# 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
-# 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
-# YEAR=2002
-# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
-# 5/12,5/14,5/15,5/19,5/26,7/16  Behrouz Minaei
 #
-###
+#######################################################
+#######################################################
 
-package Apache::lonstudentassessment; 
-
-use strict;
-use Apache::lonhtmlcommon;
-use Apache::loncoursedata;
-use GDBM_File;
-
-#my $jr;
-
-sub BuildStudentAssessmentPage {
-    my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,
-        $studentInformation,$r,$c)=@_;
-#    $jr = $r;
-    my %cache;
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        $r->print('<html><body>Unable to tie database.</body></html>');
-        return;
-    }
-
-    # Remove students who don't have the proper section.
-    my @sectionsSelected = split(':',$cache{'sectionsSelected'});
-    for(my $studentIndex=((scalar @$students)-1); $studentIndex>=0;
-        $studentIndex--) {
-        my $value = $cache{$students->[$studentIndex].':section'};
-        my $found = 0;
-        foreach (@sectionsSelected) {
-            if($_ eq 'none') {
-                if($value eq '' || !defined($value) || $value eq ' ') {
-                    $found = 1;
-                    last;
-                }
-            } else {
-                if($value eq $_) {
-                    $found = 1;
-                    last;
-                }
-            }
-        }
-        if($found == 0) {
-            splice(@$students, $studentIndex, 1);
-        }
-    }
-    my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,
-        $doNotShow) = 
-        &ShouldShowColumns(\%cache, $headings, $studentInformation);
-
-    my $selectedName = &FindSelectedStudent(\%cache, 
-                                            $cache{'StudentAssessmentStudent'},
-                                            $students);
-    $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,
-                               $doNotShow));
-    $r->rflush();
+=pod
 
-    my $Str = '';
-    if($selectedName eq 'No Student Selected') {
-	$Str .= '<h3><font color=blue>WARNING: ';
-        $Str .= 'Please select a student</font></h3>';
-        $r->print($Str);
-        return;
-    }
+=head1 NAME
 
-    $r->print(&CreateTableHeadings(\%cache, $spacing, $infoKeys, $infoHeadings,
-                                   $sequenceKeys, $sequenceHeadings));
-    untie(%cache);
-    if($c->aborted()) {  return $Str; }
+lonstudentassessment
 
-    my $selected=0;
-    $r->print('<pre>'."\n");
-    foreach (@$students) {
-        if($c->aborted()) { return $Str; }
-        next if ($_ ne $selectedName && 
-                 $selectedName ne 'All Students');
-        $selected = 1;
-
-        my @who = ($_);
-        next if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'true', 
-                                                             $cacheDB, 'true', 
-                                                             'false', $courseID,
-                                                             $r, $c) ne 'OK');
-        next if($c->aborted());
-
-        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-            my @before=();
-            my @after=();
-            my @updateColumn=();
-            my $foundUpdate = 0;
-            foreach(@$infoKeys) {
-                if(/updateTime/) {
-                    $foundUpdate=1;
-                    push(@updateColumn, $_);
-                    next;
-                }
-                if($foundUpdate) {
-                    push(@after, $_);
-                } else {
-                    push(@before, $_);
-                }
-            }
-            my $displayString = 'DISPLAYDATA'.$spacing;
-            $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
-                                                         \%cache, $_,
-                                                         \@before,
-                                                         $displayString,
-                                                         'preformatted'));
-
-            if($foundUpdate) {
-                $displayString = '';
-                $displayString .= '<a href="/adm/statistics?reportSelected=';
-                $displayString .= &Apache::lonnet::escape('Student Assessment');
-                $displayString .= '&download='.$_.'">';
-                $displayString .= 'DISPLAYDATA</a>'.$spacing;
-                $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
-                                                                   \%cache, $_,
-                                                                   \@updateColumn,
-                                                                   $displayString,
-                                                                   'preformatted'));
-            }
+=head1 SYNOPSIS
 
-            $displayString = 'DISPLAYDATA'.$spacing;
-            $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
-                                                         \%cache, $_,
-                                                         \@after,
-                                                         $displayString,
-                                                         'preformatted'));
-            $r->print(&StudentReport(\%cache, $_, $spacing, $sequenceKeys));
-            $r->print("\n");
-            $r->rflush();
-            untie(%cache);
-        }
-    }
-    $r->print('</pre>'."\n");
-    if($selected == 0) {
-	$Str .= '<h3><font color=blue>WARNING: ';
-        $Str .= 'Please select a student</font></h3>';
-        $r->print($Str);
-    }
+Presents assessment data about a student or a group of students.
 
-    return;
-}
+=head1 Subroutines
 
-#---- Student Assessment Web Page --------------------------------------------
+=over 4 
 
-sub CreateInterface {
-    my($cache,$selectedName,$students,$formName,$doNotShow)=@_;
+=cut
 
-    my $Str = '';
-    $Str .= &CreateLegend();
-    $Str .= '<table><tr><td>'."\n";
-    $Str .= '<input type="submit" name="PreviousStudent" ';
-    $Str .= 'value="Previous Student" />'."\n";
-    $Str .= '&nbsp&nbsp&nbsp'."\n";
-    $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students, 
-                                                   $selectedName, 
-                                                   'StudentAssessment', 
-                                                   $formName);
-    $Str .= "\n".'&nbsp&nbsp&nbsp'."\n";
-    $Str .= '<input type="submit" name="NextStudent" ';
-    $Str .= 'value="Next Student" />'."\n";
-    $Str .= '</td></tr></table>'."\n";
-    $Str .= '<table cellspacing="5"><tr>'."\n";
-    $Str .= '<td align="center"><b>Select Sections</b>'."\n";
-    $Str .= '</td>'."\n";
-    $Str .= '<td align="center"><b>Select column to view:</b></td>'."\n";
-    $Str .= '<td></td></tr>'."\n";
+#######################################################
+#######################################################
 
-    $Str .= '<tr><td align="center">'."\n";
-    my @sections = split(':',$cache->{'sectionList'});
-    my @selectedSections = split(':',$cache->{'sectionsSelected'});
-    $Str .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
-                                                          \@selectedSections,
-                                                          'Statistics');
-    $Str .= '</td><td align="center">';
-    $Str .= &CreateColumnSelectionBox($doNotShow);
-    $Str .= '</td><td>'."\n";
-    $Str .= '<input type="submit" name="DefaultColumns" ';
-    $Str .= 'value="Default Column Display" />'."\n";
-    $Str .= '</td></tr></table>'."\n";
+package Apache::lonstudentassessment;
 
-    return $Str;
-}
+use strict;
+use Apache::lonstatistics;
+use Apache::lonhtmlcommon;
+use Apache::loncoursedata;
+use Apache::lonnet; # for logging porpoises
+use GDBM_File;
 
-sub CreateTableHeadings {
-    my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,
-       $sequenceHeadings)=@_;
+my $Statistics;
 
-    my $Str = '';
-    $Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";
+#######################################################
+#######################################################
 
-    $Str .= '<tr>'."\n";
-    $Str .= &CreateColumnSelectors($infoHeadings, $sequenceHeadings,
-                                   $sequenceKeys);
-    $Str .= '<td></td></tr>'."\n";
-
-    $Str .= '<tr>'."\n";
-    my $displayString = '<td align="left"><pre><a href="/adm/statistics?';
-    $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';
-    $displayString .= $spacing.'</pre></td>'."\n";
-    $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache, 
-                                                   $infoKeys,
-                                                   $infoHeadings,
-                                                   $displayString,
-                                                   'preformatted');
-
-    $displayString  = '<td align="left"><pre>DISPLAYDATAFORMATTING'.$spacing;
-    $displayString .= '</pre></td>'."\n";
-    $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
-                                                   $sequenceKeys,
-                                                   $sequenceHeadings,
-                                                   $displayString,
-                                                   'preformatted');
+=pod
 
-    $Str .= '<td><pre>Total Solved/Total Problems</pre></td>';
-    $Str .= '</tr></table>'."\n";
+=item &BuildStudentAssessmentPage()
 
-    return $Str;
-}
+Inputs: 
 
-=pod
+=over 4
 
-=item &FormatStudentData()
+=item $cacheDB The name of the cache file used to store student data
 
-First, FormatStudentInformation is called and prefixes the course information.
-This function produces a formatted string of the student's course information.
-Each column of data represents all the problems for a given sequence.  For
-valid grade data, a link is created for that problem to a submission record
-for that problem.
+=item $students Array ref containing the name(s) of the students 
+selected for display
 
-=over 4
+=item $courseID The ID of the course
 
-Input: $name, $studentInformation, $ChartDB
+=item $formName The name of the html form - 'Statistics'
 
-$name: The name and domain of the current student in name:domain format
+=item $headings Array ref of headings to show
 
-$studentInformation: A pointer to an array holding the names used to 
-remove data from the hash.  They represent 
-the name of the data to be removed.
+=item $spacing A string of spaces
 
-$ChartDB: The name of the cached data database which will be tied to that 
-database.
+=item $studentInformation Array ref of possible headings for student info
+('fullname','section',...)
 
-Output: $Str
+=item $r Apache Request
 
-$Str: Formatted string that is an entire row of the chart.  It is a 
-concatenation of student information and student course information.
+=item $c Apache Connection 
 
 =back
 
 =cut
 
-sub StudentReport {
-    my ($cache,$name,$spacing,$showSequences)=@_;
-    my ($username,$domain)=split(':',$name);
+#######################################################
+#######################################################
+sub BuildStudentAssessmentPage {
+    my ($r,$c)=@_;
+    undef($Statistics);
+    
+    #
+    $r->print(&CreateInterface());
+    $r->rflush();
+    #
+    $r->print(&CreateTableHeadings());
+    if($c->aborted()) {  return ; }
+    
+    my $Count = 0;
+    $r->print('<pre>'."\n");
+    foreach my $student (@Apache::lonstatistics::Students) {
+        if($c->aborted()) { return ; }
+        $r->print(&ChartOutputStudent($student));
+        # output it
+
+        $Count++;
+        if($Count % 5 == 0) {
+            $r->print("</pre>\n<pre>");
+        }
 
-    my $Str = '';
-    if(defined($cache->{$name.':error'})) {
-        return $Str;
-    }
-    if($cache->{$name.':error'} =~ /course/) {
-        $Str .= '<b><font color="blue">No course data for student </font>';
-        $Str .= '<font color="red">'.$username.'.</font></b><br>';
-        return $Str;
+        $r->rflush();
     }
+    $r->print('</pre>'."\n"); 
+    my $Str;
+    return;
+}
 
-    my $hasVersion = 'false';
-    my $hasFinalData = 'false';
-    foreach my $sequence (@$showSequences) {
-        my $hasData = 'false';
-        my $characterCount=0;
-        foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
-            my $problem = $cache->{$problemID.':problem'};
-            # All grades (except for versionless parts) are displayed as links
-            # to their submission record.  Loop through all the parts for the
-            # current problem in the correct order and prepare the output links
-            foreach(split(/\:/,$cache->{$sequence.':'.$problemID.
-                                        ':parts'})) {
-                if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' ||
-                   $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' ||
-                   $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') {
-                    $Str .= ' ';
-                    $characterCount++;
-                    next;
-                }
-                $hasVersion = 'true';
-                $hasData = 'true';
-                $Str .= '<a href="/adm/grades?symb=';
-                $Str .= &Apache::lonnet::escape($problem);
-                $Str .= '&student='.$username.'&domain='.$domain;
-                $Str .= '&command=submission">'; 
-                my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};
-                my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};
-                if($code eq '*' && $tries < 10 && $tries ne '') {
-                    $code = $tries;
-                }
-                $Str .= $code;
-                $Str .= '</a>';
-                $characterCount++;
-            }
-        }
+#######################################################
+#######################################################
 
-        # Output the number of correct answers for the current sequence.
-        # This part takes up 6 character slots, but is formated right 
-        # justified.
-        my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount;
-        $spacesNeeded -= 3;
-        $Str .= (' 'x$spacesNeeded);
-
-        my $outputProblemsCorrect = sprintf("%3d", $cache->{$name.':'.$sequence.
-							    ':problemsCorrect'});
-
-#	my $outputProblemsCorrect = sprintf("%2d/%2d ", $cache->{$name.':'.$sequence.
-#                                            ':problemsCorrect'}, 
-#                                            $characterCount);
-        if($hasData eq 'true') {
-            $Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
-            $hasFinalData = 'true';
-        } else {
-            $Str .= '<font color="#007700">   </font>';
-        }
-        $Str .= $spacing;
-    }
+=pod
 
-    # Output the total correct problems over the total number of problems.
-    # I don't like this type of formatting, but it is a solution.  Need
-    # a way to dynamically determine the space requirements.
-    my $outputProblemsSolved = sprintf("%4d", $cache->{$name.':problemsSolved'});
-    my $outputTotalProblems  = sprintf("%4d", $cache->{$name.':totalProblems'});
-    if($hasFinalData eq 'true') {
-        $Str .= '<font color="#000088">'.$outputProblemsSolved.
-	    ' / '.$outputTotalProblems.'</font>';
-    } else {
-        $Str .= '<font color="#000088">           </font>';
-    }
+=item &CreateInterface()
 
-    if($hasVersion eq 'false') {
-        $Str = '<b><font color="blue">No course data.</font></b>';
-    }
+Called by &BuildStudentAssessmentPage to create the top part of the
+page which displays the chart.
+
+Inputs: None
 
+Returns:  A string containing the HTML for the headers and top table for 
+the chart page.
+
+=cut
+
+#######################################################
+#######################################################
+sub CreateInterface {
+    my $Str = '';
+#    $Str .= &CreateLegend();
+    $Str .= '<table cellspacing="5">'."\n";
+    $Str .= '<tr>';
+    $Str .= '<td align="center"><b>Sections</b></td>';
+    $Str .= '<td align="center"><b>Student Data</b></td>';
+    $Str .= '<td align="center"><b>Sequences and Folders</b></td>';
+    $Str .= '</tr>'."\n";
+    #
+    $Str .= '<tr><td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
+    $Str .= '</td><td align="center">';
+    my $only_seq_with_assessments = sub { 
+        my $s=shift;
+        if ($s->{'num_assess'} < 1) { 
+            return 0;
+        } else { 
+            return 1;
+        }
+    };
+    $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',
+                                                      5,undef);
+    $Str .= '</td><td>'."\n";
+    $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
+                                              $only_seq_with_assessments);
+    $Str .= '</td></tr>'."\n";
+    $Str .= '</table>'."\n";
     return $Str;
 }
 
+
+#######################################################
+#######################################################
+
 =pod
 
-=item &CreateLegend()
+=item Table Output Routines
 
-This function returns a formatted string containing the legend for the
-chart.  The legend describes the symbols used to represent grades for
-problems.
+=over 4
 
 =cut
 
-sub CreateLegend {
-    my $Str = "<p><pre>".
-              "   1  correct by student in 1 try\n".
-              "   7  correct by student in 7 tries\n".
-              "   *  correct by student in more than 9 tries\n".
-	      "   +  correct by override\n".
-              "   -  incorrect by override\n".
-	      "   .  incorrect attempted\n".
-	      "   #  ungraded attempted\n".
-              "      not attempted (blank field)\n".
-	      "   x  excused".
-              "</pre><p>"; 
-    return $Str;
-}
+#######################################################
+#######################################################
+{
+    my $padding;
+
+#######################################################
+#######################################################
 
 =pod
 
-=item &CreateColumnSelectionBox()
+=item &CreateTableHeadings()
 
-If there are columns not being displayed then this selection box is created
-with a list of those columns.  When selections are made and the page 
-refreshed, the columns will be removed from this box and the column is
-put back in the chart.  If there is no columns to select, no row is added
-to the interface table.
+Create HTML for the columns of student data to show.
+Called by &BuildStudentAssessmentPage().  Calls
+&Apache::lonhtmlcommon::CreateHeadings().
+
+Inputs:
 
 =over 4
-Input: $CacheData, $headings
 
+=item $cache The ubiquitous cache
+
+=item $spacing A string of spaces
 
-$CacheData: A pointer to a hash tied to the cached data
+=item $infoKeys Array ref to names of keys to display from the cache 
+which describe students
 
-$headings:  An array of the names of the columns for the student information.  
-They are used for displaying which columns are missing.
+=item $infoHeadings Array ref to headings of columns for student info
 
-Output: $notThere
+=item $sequenceKeys Array ref of names of keys to use to retrieve sequence
+data from the cache
 
-$notThere: The string contains one row of a table.  The first column has the 
-name of the selection box.  The second contains the selection box 
-which has a size of four.
+=item $sequenceHeadings Array ref of names of sequences used for output.
 
 =back
 
+Returns: A string containing the HTML of the table headings.
+
 =cut
 
-sub CreateColumnSelectionBox {
-    my ($doNotShow)=@_;
+#######################################################
+#######################################################
+sub CreateTableHeadings {
+    #
+    $padding = ' 'x3;
+    #
+    my $Str = '<pre>';
+    # First, the @StudentData fields need to be listed
+    my @to_show = @Apache::lonstatistics::SelectedStudentData;
+    foreach (@to_show) {
+        if ($_ eq 'all') {
+            @to_show = @Apache::lonstatistics::StudentDataOrder;
+            last;
+        }
+    }
+    foreach my $field (@to_show) {
+        my $title=$Apache::lonstatistics::StudentData{$field}->{'title'};
+        my $base =$Apache::lonstatistics::StudentData{$field}->{'base_width'};
+        my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
+        $Str .= $title.' 'x($width-$base).$padding;
+    }
+    # Now the selected sequences need to be listed
+    foreach my $map_symb (@Apache::lonstatistics::SelectedMaps) {
+        foreach my $sequence (@Apache::lonstatistics::Sequences) {
+            next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all');
+            next if ($sequence->{'num_assess'} < 1);
+            my $title = $sequence->{'title'};
+            my $base  = $sequence->{'base_width'};
+            my $width = $sequence->{'width'};
+            $Str .= $title.' 'x($width-$base).$padding;
+        }
+    }
+    $Str .= 'total';
+    $Str .= "</pre>\n";
+    return $Str;
+}
 
-    my $notThere = '';
-    $notThere .= '<select name="ReselectColumns" size="4" ';
-    $notThere .= 'multiple="true">'."\n";
+#######################################################
+#######################################################
 
-    for(my $index=0; $index<$doNotShow->{'count'}; $index++) {
-        my $name = $doNotShow->{$index.':name'};
-        $notThere .= '<option value="';
-        $notThere .= $doNotShow->{$index.':id'}.'">';
-        $notThere .= $name.'</option>'."\n";
-    }
+=pod
 
-    $notThere .= '</select>';
+=item &ChartOutputStudent($student)
 
-    return $notThere;
-}
+Return a line of the chart for a student.
 
-=pod
+=cut
 
-=item &CreateColumnSelectors()
+#######################################################
+#######################################################
+sub ChartOutputStudent {
+    my $student = shift;
+    my $Str = '';
+    # First, the @StudentData fields need to be listed
+    my @to_show = @Apache::lonstatistics::SelectedStudentData;
+    foreach (@to_show) {
+        if ($_ eq 'all') {
+            @to_show = @Apache::lonstatistics::StudentDataOrder;
+            last;
+        }
+    }
+    foreach my $field (@to_show) {
+        my $title=$student->{$field};
+        my $base =scalar(my @Tmp = split(//,$title));
+        my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
+        $Str .= $title.' 'x($width-$base).$padding;
+    }
+    # Get ALL the students data
+    my %StudentsData;
+    my @tmp = &Apache::loncoursedata::get_current_state
+        ($student->{'username'},$student->{'domain'},undef,
+         $ENV{'request.course.id'});
+    if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
+        %StudentsData = @tmp;
+    }
+    if (scalar(@tmp) < 1) {
+        $Str .= '<font color="blue">No Course Data</font>'."\n";
+        return $Str;
+    }
+    #
+    # By sequence build up the data
+    my $studentstats;
+    foreach my $map_symb (@Apache::lonstatistics::SelectedMaps) {
+        foreach my $seq (@Apache::lonstatistics::Sequences) {
+            next if ($map_symb ne $seq->{'symb'} && $map_symb ne 'all');
+            next if ($seq->{'num_assess'} < 1);
+            my ($performance,$score,$seq_max) =
+                &StudentPerformanceOnSequence($student,\%StudentsData,
+                                              $seq,'linkify');
+            $Str .= $performance.$padding;
+            $studentstats->{$seq->{'symb'}}->{'score'}= $score;
+            $studentstats->{$seq->{'symb'}}->{'max'}  = $seq_max;
+        }
+    }
+    #
+    # Total it up and store the statistics info.
+    my ($score,$max) = (0,0);
+    while (my ($symb,$seq_stats) = each (%{$studentstats})) {
+        $Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
+        $Statistics->{$symb}->{'max'}   += $seq_stats->{'max'};
+        $score += $seq_stats->{'score'};
+        $max   += $seq_stats->{'max'};
+    }
+    my $scorelength = scalar(my @tmp1 = split(//,$score));
+    my $maxlength   = scalar(my @tmp2 = split(//,$max));
+    $Str .= ' '.' 'x($maxlength-$scorelength).$score.'/'.$max;
+    $Str .= " \n";
+    return $Str;
+}    
 
-This function generates the checkboxes above the column headings.  The 
-column will be removed if the checkbox is unchecked.
+#######################################################
+#######################################################
 
-=over 4
+=pod
 
-Input: $CacheData, $headings
+=back
 
-$CacheData: A pointer to a hash tied to the cached data
+=cut
 
-$headings:  An array of the names of the columns for the student 
-information.  They are used to know what are the student information columns
+#######################################################
+#######################################################
 
-Output: $present
+}
 
-$present: The string contains the first row of a table.  Each column contains
-a checkbox which is left justified.  Currently left justification is used
-for consistency of location over the column in which it presides.
+#######################################################
+#######################################################
 
-=back
+=pod
 
-=cut
+=item &StudentPerformanceOnSequence()
 
-sub CreateColumnSelectors {
-    my ($infoHeadings, $sequenceHeadings, $sequenceKeys)=@_;
+Inputs:
 
-    my $present = '';
-    for(my $index=0; $index<(scalar @$infoHeadings); $index++) {
-        $present .= '<td align="left">';
-        $present .= '<input type="checkbox" checked="on" ';
-        $present .= 'name="HeadingColumn'.$infoHeadings->[$index].'" />';
-        $present .= '</td>'."\n";
-    }
+=over 4
 
-    for(my $index=0; $index<(scalar @$sequenceHeadings); $index++) {
-        $present .= '<td align="left">';
-        $present .= '<input type="checkbox" checked="on" ';
-        $present .= 'name="SequenceColumn'.$sequenceKeys->[$index].'" />';
-        $present .= '</td>'."\n";
-    }
+=item $student
 
-    return $present;
-}
+=item $studentdata Hash ref to all student data
 
-#---- END Student Assessment Web Page ----------------------------------------
+=item $seq Hash ref, the sequence we are working on
 
-#---- Student Assessment Worker Functions ------------------------------------
+=item $links if defined we will output links to each resource.
 
-sub FindSelectedStudent {
-    my($cache, $selectedName, $students)=@_;
+=back
 
-    if($selectedName eq 'All Students' || 
-       $selectedName eq 'No Student Selected') {
-        return $selectedName;
-    }
+=cut
 
-    for(my $index=0; $index<(scalar @$students); $index++) {
-        my $fullname = $cache->{$students->[$index].':fullname'};
-        if($fullname eq $selectedName) {
-            if($cache->{'StudentAssessmentMove'} eq 'next') {
-                if($index == ((scalar @$students) - 1)) {
-                    $selectedName = $students->[0];
-                    return $selectedName;
+#######################################################
+#######################################################
+sub StudentPerformanceOnSequence {
+    my ($student,$studentdata,$seq,$links) = @_;
+    my $Str = '';
+    my $output_width = 0;
+    my ($sum,$max) = (0,0);
+    foreach my $resource (@{$seq->{'contents'}}) {
+        next if ($resource->{'type'} ne 'assessment');
+        my $resource_data = $studentdata->{$resource->{'symb'}};
+        my $value = '';
+        foreach my $partnum (@{$resource->{'parts'}}) {
+            $max++;
+            my $symbol = ' '; # default to space
+            #
+            if (exists($resource_data->{'resource.'.$partnum.'.solved'})) {
+                my $status = $resource_data->{'resource.'.$partnum.'.solved'};
+                if ($status eq 'correct_by_override') {
+                    $symbol = '+';
+                    $sum++;
+                } elsif ($status eq 'incorrect_by_override') {
+                    $symbol = '-';
+                } elsif ($status eq 'ungraded_attempted') {
+                    $symbol = '#';
+                } elsif ($status eq 'incorrect_attempted')  {
+                    $symbol = '.';
+                } elsif ($status eq 'excused') {
+                    $symbol = 'x';
+                    $max--;
+                } elsif ($status eq 'correct_by_student' &&
+                    exists($resource_data->{'resource.'.$partnum.'.tries'})){
+                    my $num = $resource_data->{'resource.'.$partnum.'.tries'};
+                    if ($num > 9) {
+                        $symbol = '*';
+                    } elsif ($num > 0) {
+                        $symbol = $num;
+                    } else {
+                        $symbol = ' ';
+                    }
+                    $sum++;
                 } else {
-                    $selectedName = $students->[$index+1];
-                    return $selectedName;
+                    $symbol = ' ';
                 }
-            } elsif($cache->{'StudentAssessmentMove'} eq 'previous') {
-                if($index == 0) {
-                    $selectedName = $students->[-1];
-                    return $selectedName;
+            } else {
+                # Unsolved.  Did they try?
+                if (exists($resource_data->{'resource.'.$partnum.'.tries'})){
+                    $symbol = '.';
                 } else {
-                    $selectedName = $students->[$index-1];
-                    return $selectedName;
+                    $symbol = ' ';
                 }
-            } else {
-                $selectedName = $students->[$index];
-                return $selectedName;
             }
-            last;
+            #
+            $output_width++;
+            if (defined($links) && $symbol ne ' ') {
+                $symbol = '<a href="/adm/grades'.
+                    '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
+                        '&student='.$student->{'username'}.
+                            '&domain='.$student->{'domain'}.
+                                '&command=submission">'.$symbol.'</a>';
+            }
+            $value .= $symbol;
         }
+        $Str .= $value;
     }
-
-    return 'No Student Selected';
+    # Put on the totals
+    my $ratio = $sum.'/'.$max;
+    my $ratio_length = scalar(my @tmp1 = split(//,$ratio));
+    # Pad with extra spaces
+    my $width = $seq->{'width'};
+    $Str .= ' 'x($width-$output_width-$ratio_length).$ratio;
+    #
+    return ($Str,$sum,$max);
 }
 
-=pod
-
-=item &ShouldShowColumn()
+#######################################################
+#######################################################
+sub StudentAverageTotal {
+    my ($cache, $students, $sequenceKeys)=@_;
+    my $Str = "\n<b>Summary Tables:</b>\n";
+    my %Correct = ();
+    my $ProblemsSolved = 0;
+    my $TotalProblems = 0;
+    my $StudentCount = 0;
+
+    foreach my $name (@$students) {
+        $StudentCount++;
+        foreach my $sequence (@$sequenceKeys) {
+            $Correct{$sequence} +=
+	       $cache->{$name.':'.$sequence.':problemsCorrect'};
+        }
+	$ProblemsSolved += $cache->{$name.':problemsSolved'};
+        $TotalProblems += $cache->{$name.':totalProblems'};
+    }
+    if ($StudentCount) { 
+        $ProblemsSolved = sprintf( "%.2f", 
+                             $ProblemsSolved/$StudentCount);
+        $TotalProblems /= $StudentCount;
+    } else {
+        $ProblemsSolved = 0;
+        $TotalProblems  = 0;
+    }
 
-Determine if a specified column should be shown on the chart.
+    $Str .= '<table border=2 cellspacing="1">'."\n";
+    $Str .= '<tr><td><b>Students Count</b></td><td><b>'.
+            $StudentCount.'</b></td></tr>'."\n";
+    $Str .= '<tr><td><b>Total Problems</b></td><td><b>'.
+            $TotalProblems.'</b></td></tr>'."\n";
+    $Str .= '<tr><td><b>Average Correct</b></td><td><b>'.
+            $ProblemsSolved.'</b></td></tr>'."\n";
+    $Str .= '</table>'."\n";
+
+    $Str .= '<table border=2 cellspacing="1">'."\n";
+    $Str .= '<tr><th>Title</th><th>Total Problems</th>'.
+            '<th>Average Correct</th></tr>'."\n";
+    foreach my $S(@$sequenceKeys) {
+        my $title=$cache->{$S.':title'};
+	#$Str .= $cache->{$S.':problems'};
+	#my @problems=split(':', $cache->{$S.':problems'});
+	#my $pCount=scalar @problems;
+	my $pCount=MaxSeqPr($cache,@$students[0],$S);
+        my $crr;
+	if ($StudentCount) {
+            $crr=sprintf( "%.2f", $Correct{$S}/$StudentCount );
+        } else {
+            $crr="0.00";
+        }
+        $Str .= '<tr><td>'.$title.
+                '</td><td align=center>'.$pCount.
+                '</td><td align=center>'.$crr.
+                '</td></tr>'."\n";
+    }
 
-=over 4
+    $Str .= '</table>'."\n";
 
-Input: $cache, $test
+    return $Str;
+}
 
-$cache: A pointer to the hash tied to the cached data
+#######################################################
+#######################################################
 
-$test: The form name of the column (heading.$headingIndex) or 
-(sequence.$sequenceIndex)
+=pod
 
-Output: 0 (false), 1 (true)
+=item &CreateLegend()
 
-=back
+This function returns a formatted string containing the legend for the
+chart.  The legend describes the symbols used to represent grades for
+problems.
 
 =cut
 
-sub ShouldShowColumns {
-    my ($cache,$headings,$cacheKey)=@_;
-
-    my @infoKeys=();
-    my @infoHeadings=();
-
-    my @sequenceKeys=();
-    my @sequenceHeadings=();
+#######################################################
+#######################################################
+sub CreateLegend {
+    my $Str = "<p><pre>".
+              "   1  correct by student in 1 try\n".
+              "   7  correct by student in 7 tries\n".
+              "   *  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".
+              "      not attempted (blank field)\n".
+	      "   x  excused".
+              "</pre><p>";
+    return $Str;
+}
 
-    my %doNotShow;
-
-    my $index;
-    my $count = 0;
-    my $check = '';
-    for($index=0; $index < scalar @$headings; $index++) {
-        $check = 'HeadingColumn'.$headings->[$index];
-        if($cache->{'HeadingsFound'} =~ /$check/) {
-            push(@infoHeadings, $headings->[$index]);
-            push(@infoKeys, $cacheKey->[$index]);
-        } else {
-            $doNotShow{$count.':name'} = $headings->[$index];
-            $doNotShow{$count.':id'} = 'HeadingColumn'.$headings->[$index];
-            $count++;
-        }
-    }
+#######################################################
+#######################################################
 
-    foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
-        $check = 'SequenceColumn'.$sequence;
-        if($cache->{'SequencesFound'} eq 'All Sequences' || 
-           $cache->{'SequencesFound'} =~ /$check/) {
-            push(@sequenceHeadings, $cache->{$sequence.':title'});
-            push(@sequenceKeys, $sequence);
-        } else {
-            $doNotShow{$count.':name'} = $cache->{$sequence.':title'};
-            $doNotShow{$count.':id'} = 'SequenceColumn'.$sequence;
-            $count++;
-        }
-    }
+=pod 
 
-    $doNotShow{'count'} = $count;
+=back
 
-    return (\@infoHeadings, \@infoKeys, \@sequenceHeadings, 
-            \@sequenceKeys, \%doNotShow);
-}
+=cut
 
-#---- END Student Assessment Worker Functions --------------------------------
+#######################################################
+#######################################################
 
 1;
+
 __END__