--- loncom/interface/statistics/lonproblemstatistics.pm	2003/03/25 23:00:40	1.41
+++ loncom/interface/statistics/lonproblemstatistics.pm	2003/03/26 16:26:35	1.43
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.41 2003/03/25 23:00:40 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.43 2003/03/26 16:26:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -243,6 +243,7 @@ sub output_html_grouped_by_sequence {
                   "S.D.","Skew.");#,"D.F.1st","D.F.2nd");
     # #FFFFE6 #EEFFCC #DDFFFF FFDDDD #DDFFDD #FFDDFF
     foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()) {
+        my $show_part = 0;
         next if ($sequence->{'num_assess'}<1);
         $r->print("<h3>".$sequence->{'title'}."</h3>");
         $r->print('<table border="0"><tr><td bgcolor="#777777">'."\n");
@@ -252,20 +253,22 @@ sub output_html_grouped_by_sequence {
         foreach my $resource (@{$sequence->{'contents'}}) {
             next if ($resource->{'type'} ne 'assessment');
             foreach my $part (@{$resource->{'parts'}}) {
-                if ($part == 0) {
-                    $part = '&nbsp;';
-                }
                 my ($num,$tries,$mod,$mean,$Solved,$solved,$DegOfDiff,$STD,
                     $SKEW) = &Apache::loncoursedata::get_problem_statistics
                         (undef,$resource->{'symb'},$part,
                          $ENV{'request.course.id'});
+                #
+                $show_part = 1 if ($part ne '0');
+                $part = '&nbsp;' if ($part == 0);
+                #
                 my $wrongpercent = 0;
                 if (defined($num) && $num > 0) {
                     $wrongpercent=int(10*100*($num-$Solved+$solved)/$num)/10;
                 }
                 $r->print('<tr>'.&statistics_html_table_data
                           ($resource,$part,$num,$tries,$mod,$mean,$Solved,
-                           $solved,$wrongpercent,$DegOfDiff,$STD,$SKEW).
+                           $solved,$wrongpercent,$DegOfDiff,$STD,$SKEW,
+                           $show_part).
                           "</tr>\n");
             }
         }
@@ -286,16 +289,22 @@ sub output_html_grouped_by_sequence {
 sub output_html_ungrouped {
     my ($r) = @_;
     #
-    my $sortby = $ENV{'form.sortby'};
-    if (! defined($sortby) || $sortby eq '') {
-        $sortby = 'sequence';
-    }
-    #
     my $show_container = 0;
+    my $show_part = 0;
     #$r->print(&ProblemStatisticsLegend());
     my @Header = ("Title","Part","#Stdnts","Tries","Mod",
                   "Mean","#YES","#yes","%Wrng","DoDiff",
-                  "S.D.","Skew.");#,"D.F.1st","D.F.2nd");
+                  "S.D.","Skew");#,"D.F.1st","D.F.2nd");
+    #
+    my $sortby = undef;
+    foreach (@Header) {
+        if ($ENV{'form.sortby'} eq $_) {
+            $sortby = $_;
+        }
+    }
+    if (! defined($sortby) || $sortby eq '') {
+        $sortby = 'Container';
+    }
     # #FFFFE6 #EEFFCC #DDFFFF FFDDDD #DDFFDD #FFDDFF
     my @Sequences = &Apache::lonstatistics::Sequences_with_Assess();
     if (@Sequences > 1) {
@@ -304,17 +313,10 @@ sub output_html_ungrouped {
     }
     #
     $r->print('<table border="0"><tr><td bgcolor="#777777">'."\n");
-    $r->print('<table border="0" cellpadding="3">'."\n");
-    my $Str = '';
-    foreach (@Header) {
-        $Str .= '<th>'.
-     '<a href="javascript:document.Statistics.sortby.value='."'$_'".
-         ';document.Statistics.submit();">'.
-         $_.'</a></th>';
-    }
-    $r->print('<tr bgcolor="#FFFFE6">'.$Str."</tr>\n");
     $r->rflush();
     #
+    # Compile the data
+    my @Statsarray;
     foreach my $sequence (@Sequences) {
         next if ($sequence->{'num_assess'}<1);
         foreach my $resource (@{$sequence->{'contents'}}) {
@@ -324,30 +326,98 @@ sub output_html_ungrouped {
                     $SKEW) = &Apache::loncoursedata::get_problem_statistics
                         (undef,$resource->{'symb'},$part,
                          $ENV{'request.course.id'});
-                if ($part == 0) {
-                    $part = '&nbsp;';
-                }
+                #
+                $show_part = 1 if ($part ne '0');
+                $part = '&nbsp;' if ($part == 0);
+                #
                 my $wrongpercent = 0;
                 if (defined($num) && $num > 0) {
                     $wrongpercent=int(10*100*($num-$Solved+$solved)/$num)/10;
                 }
-                if ($show_container) {
-                    $r->print('<tr>'.
-                              '<td bgcolor="#FFFFE6">'.$sequence->{'title'}.
-                              '</td>'.
-                              &statistics_html_table_data
-                              ($resource,$part,$num,$tries,$mod,$mean,$Solved,
-                               $solved,$wrongpercent,$DegOfDiff,$STD,$SKEW).
-                              "</tr>\n");
-                } else {
-                    $r->print('<tr>'.&statistics_html_table_data
-                              ($resource,$part,$num,$tries,$mod,$mean,$Solved,
-                               $solved,$wrongpercent,$DegOfDiff,$STD,$SKEW).
-                              "</tr>\n");
-                }
+                push (@Statsarray,
+                      { 'sequence' => $sequence,
+                        'resource' => $resource,
+                        'Title' => $resource->{'title'},
+                        'Part'  => $part,
+                        '#Stdnts' => $num,
+                        'Tries' => $tries,
+                        'Mod' => $mod,
+                        'Mean' => $mean,
+                        '#YES' => $Solved,
+                        '#yes' => $solved,
+                        '%Wrng' => $wrongpercent,
+                        'DoDiff' => $DegOfDiff,
+                        'S.D.' => $STD,
+                        'Skew' => $SKEW,
+                      });
             }
         }
     }
+    #
+    # Table Headers
+    $r->print('<table border="0" cellpadding="3">'."\n");
+    my $Str = '';
+    foreach (@Header) {
+        next if ($_ eq 'Part' && !$show_part);
+        # Do not allow sorting on some fields
+        if ($_ eq $sortby || /^(Part)$/) {  
+            $Str .= '<th>'.$_.'</th>';
+        } else {
+            $Str .= '<th>'.
+     '<a href="javascript:document.Statistics.sortby.value='."'$_'".
+         ';document.Statistics.submit();">'.
+             $_.'</a></th>';
+        }
+    }
+    $r->print('<tr bgcolor="#FFFFE6">'.$Str."</tr>\n");
+    #
+    # Sort the data
+    my @OutputOrder;
+    if ($sortby eq 'Container') {
+        @OutputOrder = @Statsarray;
+    } else {
+        # $sortby is already defined, so we can charge ahead
+        if ($sortby =~ /^(title|part)$/i) {
+            # Alpha comparison
+            @OutputOrder = sort {
+                lc($a->{$sortby}) cmp lc($b->{$sortby}) ||
+                    lc($a->{'Title'}) cmp lc($b->{'Title'}) ||
+                        lc($a->{'Part'}) cmp lc($b->{'Part'});
+            } @Statsarray;
+        } else {
+            # Numerical comparison
+            @OutputOrder = sort {
+                my $retvalue = 0;
+                if ($b->{$sortby} eq 'nan') {
+                    if ($a->{$sortby} ne 'nan') {
+                        $retvalue = -1;
+                    } else {
+                        $retvalue = 0;
+                    }
+                }
+                if ($a->{$sortby} eq 'nan') {
+                    if ($b->{$sortby} ne 'nan') {
+                        $retvalue = 1;
+                    }
+                }
+                if ($retvalue eq '0') {
+                    $retvalue = $b->{$sortby} <=> $a->{$sortby} ||
+                                lc($a->{'Title'}) <=> lc($b->{'Title'}) ||
+                                lc($a->{'Part'})  <=> lc($b->{'Part'});
+                }
+                $retvalue;
+            } @Statsarray;
+        }
+    }
+    foreach my $row (@OutputOrder) {
+        $r->print('<tr>');
+        if ($show_container) {
+            $r->print('<td bgcolor="#FFFFE6">'
+                      .$row->{'sequence'}->{'title'}.'</td>');
+        }
+        $r->print(&stats_row_from_hash($row,$show_part));
+        $r->print("</tr>\n");
+    }
     $r->print("</table>\n");
     $r->print("</td></tr></table>\n");
     $r->rflush();
@@ -355,6 +425,17 @@ sub output_html_ungrouped {
     return;
 }
 
+sub stats_row_from_hash {
+    my ($data,$show_part) = @_;
+    return &statistics_html_table_data($data->{'resource'},$data->{'Part'},
+                                       $data->{'#Stdnts'}, $data->{'Tries'},
+                                       $data->{'Mod'},     $data->{'Mean'},
+                                       $data->{'#YES'},    $data->{'#yes'},
+                                       $data->{"\%Wrng"},  $data->{'DoDiff'},
+                                       $data->{'S.D.'},    $data->{'Skew'},
+                                       $show_part);
+}
+
 ###############################################
 ###############################################
 
@@ -362,13 +443,13 @@ sub output_html_ungrouped {
 ###############################################
 sub statistics_html_table_data {
     my ($resource,$part,$num,$tries,$mod,$mean,$Solved,$solved,$wrongpercent,
-        $DegOfDiff,$STD,$SKEW) = @_;
+        $DegOfDiff,$STD,$SKEW,$show_part) = @_;
     my $row = '';
     $row .= '<td bgcolor="#FFFFE6">'.
         '<a href="'.$resource->{'src'}.'" target="_blank" >'.
             $resource->{'title'}.'</a>'.
                 '</td>';
-    $row .= '<td bgcolor="#FFFFE6">'.$part.'</td>' if (defined($part));
+    $row .= '<td bgcolor="#FFFFE6">'.$part.'</td>' if ($show_part);
     foreach ($num,$tries) {
         $row .= '<td bgcolor="#EEFFCC" align="right">'.$_.'</td>';
     }