--- loncom/interface/statistics/lonstudentassessment.pm	2006/04/08 06:59:44	1.136
+++ loncom/interface/statistics/lonstudentassessment.pm	2006/05/30 12:46:50	1.140
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.136 2006/04/08 06:59:44 albertel Exp $
+# $Id: lonstudentassessment.pm,v 1.140 2006/05/30 12:46:50 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,6 +61,9 @@ use Apache::lonmsgdisplay();
 use Time::HiRes;
 use Spreadsheet::WriteExcel;
 use Spreadsheet::WriteExcel::Utility();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 #######################################################
 #######################################################
@@ -147,6 +150,7 @@ sub BuildStudentAssessmentPage {
                                'chartoutputmode' => 'scalar',
                                'chartoutputdata' => 'scalar',
                                'Section' => 'array',
+                               'Groups' => 'array',
                                'StudentData' => 'array',
                                'Maps' => 'array');
     &Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters);
@@ -314,11 +318,12 @@ the chart page.
 #######################################################
 sub CreateInterface {
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Chart');
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Chart');
 #    $Str .= &CreateLegend();
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Student Data</b>').'</td>';
     $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
@@ -333,6 +338,8 @@ sub CreateInterface {
     $Str .= '<tr><td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td><td align="center">';
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $Str .= '</td><td align="center">';
     $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',
                                                       5,undef);
     $Str .= '</td><td>'."\n";
@@ -1893,7 +1900,7 @@ sub student_tries_on_sequence {
                 if ($status eq 'excused') {
                     $symbol = 'x';
                     $max--;
-                } elsif ($status eq 'correct_by_override') {
+                } elsif ($status eq 'correct_by_override' && !$resource->is_task()) {
                     $symbol = '+';
                     $sum++;
                 } elsif ($tries > 0) {
@@ -1942,7 +1949,7 @@ sub student_tries_on_sequence {
                     &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1');
                 }
                 my $link = '/adm/grades'.
-                    '?symb='.&Apache::lonnet::escape($resource->symb).
+                    '?symb='.&escape($resource->symb).
                         '&student='.$student->{'username'}.
                             '&userdom='.$student->{'domain'}.
                                 '&command=submission';
@@ -2097,7 +2104,7 @@ sub student_performance_on_sequence {
             #
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 my $link = '/adm/grades' .
-                    '?symb='.&Apache::lonnet::escape($symb).
+                    '?symb='.&escape($symb).
                     '&student='.$student->{'username'}.
                     '&userdom='.$student->{'domain'}.
                     '&command=submission';