Add admin data messages to analyze page for insufficient/irrelevant states

app/presenters/analyze/graph/column/all_admin.rb

@@ -9,24 +9,25 @@ module Analyze
         end
 
         def basis
-          'student'
+          'admin data'
         end
 
         def show_irrelevancy_message?
-          # !measure.includes_admin_data_items?
+          !measure.includes_admin_data_items?
-          false
         end
 
         def show_insufficient_data_message?
-          # academic_years.any? do |year|
+          !academic_years.any? do |year|
-          #   measure.sufficient_admin_data?(school:, academic_year: year)
+            measure.sufficient_admin_data?(school:, academic_year: year)
-          # end
+          end
-          false
+        end
+
+        def insufficiency_message
+          ['data not', 'available']
         end
 
         def score(year_index)
           measure.admin_score(school:, academic_year: academic_years[year_index])
-          # Score.new(average: 3)
         end
       end
     end

app/presenters/analyze/graph/column/all_student.rb

@@ -8,10 +8,6 @@ module Analyze
           'All Students'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           !measure.includes_student_survey_items?
         end

app/presenters/analyze/graph/column/all_survey_data.rb

@@ -8,10 +8,6 @@ module Analyze
           'Survey Data'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/all_teacher.rb

@@ -9,7 +9,7 @@ module Analyze
         end
 
         def basis
-          'teacher'
+          'teacher surveys'
         end
 
         def show_irrelevancy_message?

app/presenters/analyze/graph/column/american_indian.rb

@@ -9,10 +9,6 @@ module Analyze
           'American Indian'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/asian.rb

@@ -9,10 +9,6 @@ module Analyze
           'Asian'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/black.rb

@@ -9,10 +9,6 @@ module Analyze
           'Black'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb

@@ -106,6 +106,14 @@ module Analyze
           number_of_columns
         end
 
+        def basis
+          'student surveys'
+        end
+
+        def insufficiency_message
+          ['survey response', 'rate below 25%']
+        end
+
         private
 
         YearlyScore = Struct.new(:year, :score)

app/presenters/analyze/graph/column/hispanic.rb

@@ -9,10 +9,6 @@ module Analyze
           'Hispanic'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/middle_eastern.rb

@@ -10,10 +10,6 @@ module Analyze
           'Middle Eastern'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/multiracial.rb

@@ -9,10 +9,6 @@ module Analyze
           'Multiracial'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/unknown.rb

@@ -9,10 +9,6 @@ module Analyze
           'Race/Ethnicity Not-Listed'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/presenters/analyze/graph/column/white.rb

@@ -9,10 +9,6 @@ module Analyze
           'White'
         end
 
-        def basis
-          'student'
-        end
-
         def show_irrelevancy_message?
           false
         end

app/views/analyze/_grouped_bar_column.html.erb

@@ -24,14 +24,16 @@
     <text x="<%= column.column_midpoint %>%" y="<%= 20 %>%" text-anchor="middle">
       <tspan x="<%= column.column_midpoint %>%" y="29%">measure not</tspan>
       <tspan x="<%= column.column_midpoint %>%" y="34%">based on</tspan>
-      <tspan x="<%= column.column_midpoint %>%" y="39%"><%= column.basis %>  surveys </tspan>
+      <tspan x="<%= column.column_midpoint %>%" y="39%"><%= column.basis %></tspan>
     </text>
   <% elsif column.show_insufficient_data_message? %>
   <rect x="<%= column.message_x %>%" y="<%= column.message_y %>%" rx="15" ry="15" width="<%= column.message_width %>%" height="<%= column.message_height %>%" fill="white" stroke="gray" />
 
     <text x="<%= column.column_midpoint %>%" y="<%= 20 %>%" text-anchor="middle">
-      <tspan x="<%= column.column_midpoint %>%" y="29%">survey response</tspan>
+    <% column.insufficiency_message.each_with_index do |line, index|  %>
-      <tspan x="<%= column.column_midpoint %>%" y="34%">rate below 25%</tspan>
+      <% offset = 29 + index * 5 %>
+      <tspan x='<%= column.column_midpoint  %>%' y='<%=  offset %>%'><%= line %></tspan>
+    <% end  %>
     </text>
   <% end %>
 </g>

spec/presenters/grouped_bar_column_presenter_spec.rb

@@ -184,7 +184,7 @@ describe GroupedBarColumnPresenter do
       end
 
       it 'returns a text representation of the type of survey the bars are based on' do
-        expect(student_presenter.basis).to eq 'student'
+        expect(student_presenter.basis).to eq 'student surveys'
       end
 
       it 'returns only bars that have a numeric score' do