--- loncom/interface/statistics/lonproblemstatistics.pm	2018/03/07 13:32:56	1.122.2.4
+++ loncom/interface/statistics/lonproblemstatistics.pm	2018/03/07 12:24:27	1.128
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.122.2.4 2018/03/07 13:32:56 raeburn Exp $
+# $Id: lonproblemstatistics.pm,v 1.128 2018/03/07 12:24:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,7 @@ package Apache::lonproblemstatistics;
 use strict;
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonquickgrades();
 use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use Apache::lonstatistics;
@@ -589,9 +590,9 @@ sub field_selection_input {
     $Str .= '<option value="all">'.&mt('all').'</option>'."\n";
     foreach my $field (@Fields) {
         next if ($field->{'selectable'} ne 'yes');
-        $Str .= '    <option value="'.$field->{'name'}.'"';
+        $Str .= '    <option value="'.$field->{'name'}.'" ';
         if ($field->{'selected'} eq 'yes') {
-            $Str .= ' selected="selected"';
+            $Str .= 'selected="selected" ';
         }
         $Str .= '>'.&mt($field->{'title'}).'</option>'."\n";
     }
@@ -704,6 +705,7 @@ sub BuildProblemStatisticsPage {
     # Finally let the user know we are here
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Overall Problem Statistics',
                                                 'Statistics_Overall_Key'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
 
     my $interface = &CreateInterface($r);
     $r->print($interface);
@@ -757,9 +759,10 @@ sub BuildProblemStatisticsPage {
                   &Apache::lonstatistics::section_and_enrollment_description().
                   '</p>');
         my $count = 0;
+        my $include_tools = 1;
         foreach my $seq (@sequences) {
             my @resources =
-                &Apache::lonstathelpers::get_resources($navmap,$seq);
+                &Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools);
             $count += scalar(@resources);
         }
         if ($count > 10) {
@@ -1467,8 +1470,9 @@ sub write_headers {
 ##################################################
 sub compute_statistics_on_sequence {
     my ($seq) = @_;
+    my $include_tools = 1;
     my @Data;
-    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)) {
         foreach my $part (@{$res->parts}) {
             next if (($res->is_survey($part)) || ($res->is_anonsurvey($part))) ;
             #
@@ -1646,9 +1650,10 @@ Returns: integer between -1 and 1
 ###############################################
 sub compute_discrimination_factor {
     my ($resource,$part,$seq) = @_;
+    my $include_tools = 1;
     my $symb = $resource->symb;
     my @Resources;
-    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)){
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)){
         next if ($res->symb eq $symb);
         push (@Resources,$res->symb);
     }
@@ -1712,10 +1717,11 @@ sub compute_discrimination_factor {
 ###############################################
 sub compute_sequence_statistics {
     my ($seq) = @_;
+    my $include_tools = 1;
     my $symb = $seq->symb;
     my @Resources;
     my $part_count;
-    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)) {
         push (@Resources,$res->symb);
         $part_count += scalar(@{$res->parts});
     }