--- loncom/interface/lonstatistics.pm	2006/05/01 19:37:34	1.132
+++ loncom/interface/lonstatistics.pm	2008/11/10 13:20:14	1.143
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.132 2006/05/01 19:37:34 albertel Exp $
+# $Id: lonstatistics.pm,v 1.143 2008/11/10 13:20:14 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,9 @@ lonstatistics
 
 Main handler for statistics and chart.
 
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
 =over 4
 
 =cut
@@ -63,6 +66,7 @@ use Apache::loncoursedata;
 use Apache::lonhtmlcommon;
 use Apache::lonmysql;
 use Apache::lonlocal;
+use Apache::longroup;
 use Time::HiRes;
 #
 # Statistics Packages
@@ -75,6 +79,7 @@ use Apache::lonpercentage;
 use Apache::lonstudentsubmissions();
 use Apache::lonsurveyreports();
 use Apache::longradinganalysis();
+use LONCAPA;
 
 #######################################################
 #######################################################
@@ -230,12 +235,13 @@ sub PrepareClasslist {
     $enrollment_status = $env{'form.Status'} if (exists($env{'form.Status'}));
     #
     # Get groupmembership
-    my (%curr_groups,$classgroups,$studentgroups);
-    my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum);
-    if ($numgroups) {
+    my ($classgroups,$studentgroups);
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+    if (%curr_groups) {
         ($classgroups,$studentgroups) = 
-                     &Apache::loncoursedata::get_group_memberships($classlist,
-                                                                   $cdom,$cnum);
+	    &Apache::loncoursedata::get_group_memberships($classlist,
+                                                          $field_names,
+							  $cdom,$cnum);
     }
     my $now = time;
 
@@ -309,7 +315,11 @@ sub PrepareClasslist {
     if ($env{'request.course.sec'} !~ /^\s*$/) {
         @Sections = ($env{'request.course.sec'});
     } else {
-        @Sections = sort {$a cmp $b} keys(%Sections);
+        @Sections = sort {
+	    if ($a == $a && $b == $b ) { return $a <=> $b; }
+	    return $a cmp $b;
+	} keys(%Sections);
+
         unshift(@Sections,'all'); # Put 'all' at the front of the list
     }
     # Sort the groups
@@ -428,7 +438,7 @@ sub get_selected_groups {
 =item &section_and_enrollment_description
 
 Returns a string describing the currently selected section(s), group(s) and 
-enrollment status.  
+access status.  
 
 Inputs: mode = 'plaintext' or 'localized'  (defaults to 'localized')
     'plaintext' is used for example in Excel spreadsheets.
@@ -445,9 +455,9 @@ sub section_and_enrollment_description {
     my @groups = &Apache::lonstatistics::get_selected_groups();
     my $description;
     if ($mode eq 'localized') {
-        $description = &mt('Unable to determine section, groups and enrollment');
+        $description = &mt('Unable to determine section, groups and access status');
     } elsif ($mode eq 'plaintext') {
-        $description = 'Unable to determine section, groups and enrollment';
+        $description = 'Unable to determine section, groups and access status';
     } else {
         $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description';
         &Apache::lonnet::logthis($description);
@@ -455,9 +465,9 @@ sub section_and_enrollment_description {
     $description = &section_or_group_text($mode,'section',@sections).
 	' '.&section_or_group_text($mode,'group',@groups);
     if ($mode eq 'localized') {
-        $description .= &mt(' [_1] enrollment status.',$env{'form.Status'});
+        $description .= ' '.&mt($env{'form.Status'}.' access status.');
     } elsif ($mode eq 'plaintext') {
-        $description .= ' '.$env{'form.Status'}.' enrollment status.';
+        $description .= ' '.$env{'form.Status'}.' access status.';
     }
     return $description;
 }
@@ -481,21 +491,21 @@ sub section_or_group_text {
                              );
     if (scalar(@items) == 1 && $items[0] ne 'all') {
         if ($mode eq 'localized') {
-            $text = &mt('[_1] [_2].',$phrases{$type}{single},$items[0]);
+            $text = &mt($phrases{$type}{single}.' [_1].',$items[0]);
         } elsif ($mode eq 'plaintext') {
             $text = $phrases{$type}{single}.' '.$items[0].'.';
 
         }
     } elsif (scalar(@items) && $items[0] eq 'all') {
         if ($mode eq 'localized') {
-            $text = &mt('[_1].',$phrases{$type}{all});
+            $text = &mt($phrases{$type}{all}.'.');
         } elsif ($mode eq 'plaintext') {
             $text = $phrases{$type}{all}.'.';
         }
     } elsif (scalar(@items)) {
         my $lastitem = pop(@items);
         if ($mode eq 'localized') {
-            $text = &mt('[_1] [_2] and [_3].',$phrases{$type}{plural},
+            $text = &mt($phrases{$type}{plural}.' [_1] and [_2].',
                         join(', ',@items),$lastitem);
         } elsif ($mode eq 'plaintext') {
             $text = $phrases{$type}{plural}.' '.join(', ',@items).' and '.
@@ -700,8 +710,13 @@ sub selected_sequences_with_assessments
     #
     my @sequences = $navmap->retrieveResources(undef,
                                                sub { shift->is_map(); },1,0,1);
+    my $toplevelseq = $navmap->getById('0.0');
+    if (!grep(/^\Q$toplevelseq\E$/,@sequences)) {
+        unshift(@sequences,$toplevelseq);
+    }
+
     my @sequences_with_assessments;
-    for my $sequence ($navmap->getById('0.0'), @sequences) {
+    foreach my $sequence (@sequences) {
 	if ($navmap->hasResource($sequence,sub { shift->is_problem(); },0,1)){
             push(@sequences_with_assessments,$sequence);
         }
@@ -927,7 +942,7 @@ sub DisplayClasslist {
     $Str .= '<tr>';
     $Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>';
     $Str .= '<th align="center"><b>'.&mt('Groups').'</b></th>';
-    $Str .= '<th align="center"><b>'.&mt('Enrollment Status').'</b></th>';
+    $Str .= '<th align="center"><b>'.&mt('Access Status').'</b></th>';
     $Str .= '</tr>'.$/;
     $Str .= '<tr>';
     $Str .= '<td>'.
@@ -953,46 +968,55 @@ sub DisplayClasslist {
     my @selected_sections = &get_selected_sections();
     if (! @Students) {
         if ($selected_sections[0] eq 'all') { 
-            if (lc($env{'form.Status'}) eq 'any') {
-                $Str .= '<h2>'.
-                    &mt('There are no students in the course.').
-                    '</h2>';
-            } elsif (lc($env{'form.Status'}) eq 'active') {
-                $Str .= '<h2>'.
+            if (lc($env{'form.Status'}) eq 'active') {
+                $Str .= '<p class="LC_info">'.
                 &mt('There are no currently enrolled students in the course.').
-                    '</h2>';
+                    '</p>';
             } elsif (lc($env{'form.Status'}) eq 'expired') {
-                $Str .= '<h2>'.
+                $Str .= '<p class="LC_info">'.
                     &mt('There are no previously enrolled students in the course.').
-                        '</h2>';
+                        '</p>';
+            } elsif (lc($env{'form.Status'}) eq 'future') {
+                $Str .= '<p class="LC_info">'.
+                    &mt('There are no students with future access in the course.').
+                        '</p>';
+            } else { # 'any' and any others
+               $Str .= '<p class="LC_info">'.
+                    &mt('There are no students in the course.').
+                    '</p>';
             }
         } else { 
-            my $sections;
-            if (lc($env{'form.Status'}) eq 'any') {
-                $Str .= '<h2>'.
-                    &mt('There are no students in the selected sections.').
-                    '</h2>';
-            } elsif (lc($env{'form.Status'}) eq 'active') {
-                $Str .= '<h2>'.
+            if (lc($env{'form.Status'}) eq 'active') {
+                $Str .= '<p class="LC_info">'.
                     &mt('There are no currently enrolled students in the selected sections.').
-                    '</h2>';
+                    '</p>';
             } elsif (lc($env{'form.Status'}) eq 'expired') {
-                $Str .= '<h2>'.
+                $Str .= '<p class="LC_info">'.
                     &mt('There are no previously enrolled students in the selected sections.').
-                    '</h2>';
+                    '</p>';
+            } elsif (lc($env{'form.Status'}) eq 'future') {
+                $Str .= '<p class="LC_info">'.
+                    &mt('There are no students with future access in the selected sections.').
+                        '</p>';
+            } else { # 'any' and any others
+                $Str .= '<p class="LC_info">'.
+                    &mt('There are no students in the selected sections.').
+                    '</p>';
             }
         }
-        $Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'.
-            &mt('Click here to return to the chart').'</a>';
+        $Str.= '<p>'
+              .'<a href="/adm/statistics?reportSelected=student_assessment">'
+              .&mt('Return to the chart').'</a>'
+              .'</p>';
         $r->print($Str);
         $r->rflush();
         return;
     }
 
-    # "Click" is asinine but it is probably not my place to change the world.
-    $Str .= '<h2>Click on a students name or username to view their chart</h2>';
-    $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
-    $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
+    $Str .= '<h2>'.&mt('Select One Student').'</h2>'
+           .'<p>'.&mt("Click on a student's name or username to view their chart").'</p>'
+           .&Apache::loncommon::start_data_table()
+           .&Apache::loncommon::start_data_table_header_row();
     foreach my $field (@Fields) {
         $Str .= '<th><a href="/adm/statistics?'.
             'reportSelected=student_assessment&'.
@@ -1000,26 +1024,20 @@ sub DisplayClasslist {
             'sort='.$field.'">'.&mt($field).
             '</a></th>';
     }
-    $Str .= '</tr>'."\n";
+    $Str .= &Apache::loncommon::end_data_table_header_row();
     #
-    my $alternate = 0;
     foreach my $student (@Students) { # @Students is a package variable
         my $sname = $student->{'username'}.':'.$student->{'domain'};
-        if($alternate) {
-            $Str .= '<tr bgcolor="#ffffe6">';
-        } else {
-            $Str .= '<tr bgcolor="#ffffc6">';
-        }
-        $alternate = ($alternate + 1) % 2;
+        $Str .= &Apache::loncommon::start_data_table_row();
         #
         foreach my $field (@Fields) {
             $Str .= '<td>';
             if ($field eq 'fullname' || $field eq 'username') {
                 $Str .= '<a href="/adm/statistics?reportSelected=';
-                $Str .= &Apache::lonnet::escape('student_assessment');
-                $Str .= '&sort='.&Apache::lonnet::escape($env{'form.sort'});
+                $Str .= &escape('student_assessment');
+                $Str .= '&sort='.&escape($env{'form.sort'});
                 $Str .= '&SelectedStudent=';
-                $Str .= &Apache::lonnet::escape($sname).'">';
+                $Str .= &escape($sname).'">';
                 $Str .= $student->{$field}.'&nbsp';
                 $Str .= '</a>';
             } elsif ($field eq 'status') {
@@ -1029,9 +1047,9 @@ sub DisplayClasslist {
             }
             $Str .= '</td>';
         }
-        $Str .= "</tr>\n";
+        $Str .= &Apache::loncommon::end_data_table_row();
     }
-    $Str .= '</table></td></tr></table>'."\n";
+    $Str .= &Apache::loncommon::end_data_table();
     #
     $r->print($Str);
     $r->rflush();
@@ -1169,12 +1187,13 @@ ENDSTYLE
     #
         if (! &Apache::lonmysql::verify_sql_connection()) {
             my $serveradmin = $r->dir_config('lonAdmEMail');
-            $r->print('<h2><font color="Red">'.
+            $r->print('<h2 class="LC_error">'.
                       &mt('Unable to connect to database!').
-                      '</font></h2>');
-            $r->print('<p>'.
-                      &mt('Please notify the server administrator ').
-                      '<b>'.$serveradmin.'</b></p>');
+                      '</h2>');
+            $r->print('<p>'
+                     .&mt('Please notify the server administrator [_1]',
+                         ,'<b>'.$serveradmin.'</b>')
+                     .'</p>');
             $r->print('<p>'.
                       &mt('Course Statistics and Charts cannot be '.
                           'retrieved until the database is restarted.  '.