feat: change 'school admin data' to 'school data'

app/presenters/admin_data_presenter.rb

@@ -7,7 +7,7 @@ class AdminDataPresenter < DataItemPresenter
   end
 
   def title
-    'School admin data'
+    "School data"
   end
 
   def id
@@ -19,7 +19,7 @@ class AdminDataPresenter < DataItemPresenter
   end
 
   def reason_for_insufficiency
-    'limited availability'
+    "limited availability"
   end
 
   def descriptions_and_availability

app/views/categories/_subcategory_section.html.erb

@@ -19,7 +19,7 @@
             data-bs-placement="bottom"
           >
           <p class="response-rate-percentage"><%= subcategory.admin_collection_rate.first %> / <%= subcategory.admin_collection_rate.last %></p>
-            <p>school admin data sources</p>
+            <p>school data sources</p>
           </div>
           <div
             class="body-large mx-3 text-center response-rate"

app/views/layouts/_empty_dataset_modal.html.erb

@@ -8,7 +8,7 @@
       <div class="modal-body">
         <p>We’re unable to display results for the selected school and school year due to: </p>
         <ul>
-          <li>Limited availability of school admin data</li>
+          <li>Limited availability of school data</li>
           <li> Teacher and student survey response rates below 25% </li>
         </ul>
         <p> You may continue to explore the structure of the MCIEA School Quality Measures Framework, but we recommend selecting a different school and/or a different school year for the best experience. </p>

app/views/overview/_subcategory_card.html.erb

@@ -1,5 +1,5 @@
 <div class="subcategory-card__benchmark-item">
-  <svg class="subcategory-card__circle" width="24" height="24" xmlns="http://www.w3.org/2000/svg" <%= "data-bs-toggle=popover" if subcategory_card.insufficient_data? %>  data-bs-placement="top" data-bs-content="This subcategory is not displayed due to limited availability of school admin data and/or low survey response rates.">
+  <svg class="subcategory-card__circle" width="24" height="24" xmlns="http://www.w3.org/2000/svg" <%= "data-bs-toggle=popover" if subcategory_card.insufficient_data? %>  data-bs-placement="top" data-bs-content="This subcategory is not displayed due to limited availability of school data and/or low survey response rates.">
     <use class="harvey-ball harvey-ball--<%= subcategory_card.color %>" xlink:href="#<%= subcategory_card.harvey_ball_icon %>"></use>
   </svg>
 

app/views/overview/_variance_chart.html.erb

@@ -2,9 +2,9 @@
 <% not_displayed_presenters = presenters - displayed_presenters %>
 
 <% if displayed_presenters.none? %>
-<p class="caption mb-5">Note: No measures can be displayed due to limited availability of school admin data and/or low survey response rates.</p>
+<p class="caption mb-5">Note: No measures can be displayed due to limited availability of school data and/or low survey response rates.</p>
 <% elsif not_displayed_presenters.present? %>
-<p class="caption mb-5">Note: The following measures are not displayed due to limited availability of school admin data and/or low survey response rates: <%= not_displayed_presenters.map(&:measure_name).join('; ') %>.</p>
+<p class="caption mb-5">Note: The following measures are not displayed due to limited availability of school data and/or low survey response rates: <%= not_displayed_presenters.map(&:measure_name).join('; ') %>.</p>
 <% end %>
 
 <svg width="100%" height=<%= graph_height(displayed_presenters.size) %> xmlns="http://www.w3.org/2000/svg">

spec/presenters/measure_presenter_spec.rb

@@ -1,9 +1,9 @@
-require 'rails_helper'
+require "rails_helper"
 
 describe MeasurePresenter do
-  let(:academic_year) { create(:academic_year, range: '1989-90') }
+  let(:academic_year) { create(:academic_year, range: "1989-90") }
-  let(:school) { create(:school, name: 'Best School') }
+  let(:school) { create(:school, name: "Best School") }
-  let(:measure) { create(:measure, measure_id: 'measure-id') }
+  let(:measure) { create(:measure, measure_id: "measure-id") }
   let(:teacher_scale) { create(:teacher_scale, measure:) }
   let(:student_scale) { create(:student_scale, measure:) }
   let(:admin_scale) { create(:scale, measure:) }
@@ -12,18 +12,18 @@ describe MeasurePresenter do
     create(:respondent, school:, academic_year:)
   end
 
-  it 'returns the id of the measure' do
+  it "returns the id of the measure" do
-    expect(measure_presenter.id).to eq 'measure-id'
+    expect(measure_presenter.id).to eq "measure-id"
   end
 
-  it 'has an id for use in the data item accordions' do
+  it "has an id for use in the data item accordions" do
-    expect(measure_presenter.data_item_accordion_id).to eq 'data-item-accordion-measure-id'
+    expect(measure_presenter.data_item_accordion_id).to eq "data-item-accordion-measure-id"
   end
 
-  context 'when the measure contains only teacher data' do
+  context "when the measure contains only teacher data" do
     before :each do
-      survey_item1 = create(:teacher_survey_item, scale: teacher_scale, prompt: 'A teacher survey item prompt')
+      survey_item1 = create(:teacher_survey_item, scale: teacher_scale, prompt: "A teacher survey item prompt")
-      survey_item2 = create(:teacher_survey_item, scale: teacher_scale, prompt: 'Another teacher survey item prompt')
+      survey_item2 = create(:teacher_survey_item, scale: teacher_scale, prompt: "Another teacher survey item prompt")
 
       create_list(:survey_item_response, SurveyItemResponse::TEACHER_RESPONSE_THRESHOLD, survey_item: survey_item1,
                                                                                          academic_year:, school:, likert_score: 1)
@@ -31,48 +31,42 @@ describe MeasurePresenter do
                                                                                          academic_year:, school:, likert_score: 5)
     end
 
-    it 'creates a gauge presenter that presents the average likert score' do
+    it "creates a gauge presenter that presents the average likert score" do
-      expect(measure_presenter.gauge_presenter.title).to eq 'Growth'
+      expect(measure_presenter.gauge_presenter.title).to eq "Growth"
     end
 
     it 'returns a list of data item presenters that has only one element, and that element has a title of "Teacher survey"' do
       expect(measure_presenter.data_item_presenters.count).to eq 1
-      expect(measure_presenter.data_item_presenters.first.id).to eq 'teacher-survey-items-measure-id'
+      expect(measure_presenter.data_item_presenters.first.id).to eq "teacher-survey-items-measure-id"
-      expect(measure_presenter.data_item_presenters.first.title).to eq 'Teacher survey'
+      expect(measure_presenter.data_item_presenters.first.title).to eq "Teacher survey"
-      expect(measure_presenter.data_item_presenters.first.data_item_accordion_id).to eq 'data-item-accordion-measure-id'
+      expect(measure_presenter.data_item_presenters.first.data_item_accordion_id).to eq "data-item-accordion-measure-id"
-      expect(measure_presenter.data_item_presenters.first.item_descriptions).to eq ['A teacher survey item prompt',
-                                                                                    'Another teacher survey item prompt']
     end
   end
 
-  context 'when the measure contains both teacher data and admin data' do
+  context "when the measure contains both teacher data and admin data" do
     before :each do
-      create(:teacher_survey_item, scale: teacher_scale, prompt: 'A teacher survey item prompt')
+      create(:teacher_survey_item, scale: teacher_scale, prompt: "A teacher survey item prompt")
-      create(:teacher_survey_item, scale: teacher_scale, prompt: 'Another teacher survey item prompt')
+      create(:teacher_survey_item, scale: teacher_scale, prompt: "Another teacher survey item prompt")
-      create(:admin_data_item, scale: admin_scale, description: 'An admin data item description')
+      create(:admin_data_item, scale: admin_scale, description: "An admin data item description")
-      create(:admin_data_item, scale: admin_scale, description: 'Another admin data item description')
+      create(:admin_data_item, scale: admin_scale, description: "Another admin data item description")
     end
 
-    it 'returns a list of data item presenters with two elements' do
+    it "returns a list of data item presenters with two elements" do
       expect(measure_presenter.data_item_presenters.count).to eq 2
 
       first_data_item_presenter = measure_presenter.data_item_presenters[0]
-      expect(first_data_item_presenter.id).to eq 'teacher-survey-items-measure-id'
+      expect(first_data_item_presenter.id).to eq "teacher-survey-items-measure-id"
-      expect(first_data_item_presenter.title).to eq 'Teacher survey'
+      expect(first_data_item_presenter.title).to eq "Teacher survey"
-      expect(first_data_item_presenter.data_item_accordion_id).to eq 'data-item-accordion-measure-id'
+      expect(first_data_item_presenter.data_item_accordion_id).to eq "data-item-accordion-measure-id"
-      expect(first_data_item_presenter.item_descriptions).to eq ['A teacher survey item prompt',
-                                                                 'Another teacher survey item prompt']
 
       second_data_item_presenter = measure_presenter.data_item_presenters[1]
-      expect(second_data_item_presenter.id).to eq 'admin-data-items-measure-id'
+      expect(second_data_item_presenter.id).to eq "admin-data-items-measure-id"
-      expect(second_data_item_presenter.title).to eq 'School admin data'
+      expect(second_data_item_presenter.title).to eq "School data"
-      expect(second_data_item_presenter.data_item_accordion_id).to eq 'data-item-accordion-measure-id'
+      expect(second_data_item_presenter.data_item_accordion_id).to eq "data-item-accordion-measure-id"
-      expect(second_data_item_presenter.item_descriptions).to eq ['An admin data item description',
-                                                                  'Another admin data item description']
     end
   end
 
-  context 'when the measure has partial data for teachers and students' do
+  context "when the measure has partial data for teachers and students" do
     before :each do
       teacher_survey_item = create(:teacher_survey_item, scale: teacher_scale)
       student_survey_item = create(:student_survey_item, scale: student_scale)
@@ -83,38 +77,38 @@ describe MeasurePresenter do
                   survey_item: student_survey_item, academic_year:, school:)
     end
 
-    it 'tracks which parts of the data are sufficient' do
+    it "tracks which parts of the data are sufficient" do
       teacher_data_item_presenter = measure_presenter.data_item_presenters.find do |presenter|
-        presenter.title == 'Teacher survey'
+        presenter.title == "Teacher survey"
       end
       student_data_item_presenter = measure_presenter.data_item_presenters.find do |presenter|
-        presenter.title == 'Student survey'
+        presenter.title == "Student survey"
       end
       expect(teacher_data_item_presenter.sufficient_data?).to be true
       expect(student_data_item_presenter.sufficient_data?).to be false
     end
   end
 
-  context 'when the measure has insufficient admin data and insufficient teacher/student data' do
+  context "when the measure has insufficient admin data and insufficient teacher/student data" do
     before :each do
       create(:admin_data_item, scale: admin_scale)
       create(:teacher_survey_item, scale: teacher_scale)
       create(:student_survey_item, scale: student_scale)
     end
 
-    it 'tracks the reason for their insufficiency' do
+    it "tracks the reason for their insufficiency" do
       teacher_data_item_presenter = measure_presenter.data_item_presenters.find do |presenter|
-        presenter.title == 'Teacher survey'
+        presenter.title == "Teacher survey"
       end
       student_data_item_presenter = measure_presenter.data_item_presenters.find do |presenter|
-        presenter.title == 'Student survey'
+        presenter.title == "Student survey"
       end
       admin_data_item_presenter = measure_presenter.data_item_presenters.find do |presenter|
-        presenter.title == 'School admin data'
+        presenter.title == "School data"
       end
-      expect(teacher_data_item_presenter.reason_for_insufficiency).to eq 'low response rate'
+      expect(teacher_data_item_presenter.reason_for_insufficiency).to eq "low response rate"
-      expect(student_data_item_presenter.reason_for_insufficiency).to eq 'low response rate'
+      expect(student_data_item_presenter.reason_for_insufficiency).to eq "low response rate"
-      expect(admin_data_item_presenter.reason_for_insufficiency).to eq 'limited availability'
+      expect(admin_data_item_presenter.reason_for_insufficiency).to eq "limited availability"
     end
   end
 end

spec/views/overview/index.html.erb_spec.rb

@@ -1,11 +1,11 @@
-require 'rails_helper'
+require "rails_helper"
 include VarianceHelper
 
-describe 'overview/index' do
+describe "overview/index" do
   subject { Nokogiri::HTML(rendered) }
 
   let(:support_for_teaching) do
-    measure = create(:measure, name: 'Support For Teaching Development & Growth', measure_id: '1')
+    measure = create(:measure, name: "Support For Teaching Development & Growth", measure_id: "1")
     scale = create(:scale, measure:)
     create(:student_survey_item,
            scale:,
@@ -17,7 +17,7 @@ describe 'overview/index' do
   end
 
   let(:effective_leadership) do
-    measure = create(:measure, name: 'Effective Leadership', measure_id: '2')
+    measure = create(:measure, name: "Effective Leadership", measure_id: "2")
     scale = create(:scale, measure:)
     create(:teacher_survey_item,
            scale:,
@@ -29,7 +29,7 @@ describe 'overview/index' do
   end
 
   let(:professional_qualifications) do
-    measure = create(:measure, name: 'Professional Qualifications', measure_id: '3')
+    measure = create(:measure, name: "Professional Qualifications", measure_id: "3")
     scale = create(:scale, measure:)
     create(:admin_data_item,
            scale:,
@@ -59,7 +59,7 @@ describe 'overview/index' do
     render
   end
 
-  context 'when some presenters have a nil score' do
+  context "when some presenters have a nil score" do
     let(:variance_chart_row_presenters) do
       [
         VarianceChartRowPresenter.new(measure: support_for_teaching, score: Score.new),
@@ -68,24 +68,24 @@ describe 'overview/index' do
       ]
     end
 
-    it 'displays a note detailing which measures have insufficient responses for the given school & academic year' do
+    it "displays a note detailing which measures have insufficient responses for the given school & academic year" do
-      expect(rendered).to match %r{Note: The following measures are not displayed due to limited availability of school admin data and/or low survey response rates: Support For Teaching Development & Growth; Professional Qualifications.}
+      expect(rendered).to match %r{Note: The following measures are not displayed due to limited availability of school data and/or low survey response rates: Support For Teaching Development & Growth; Professional Qualifications.}
     end
 
-    it 'displays a variance row and label only those presenters for which the score is not nil' do
+    it "displays a variance row and label only those presenters for which the score is not nil" do
-      displayed_variance_rows = subject.css('[data-for-measure-id]')
+      displayed_variance_rows = subject.css("[data-for-measure-id]")
       expect(displayed_variance_rows.count).to eq 1
-      expect(displayed_variance_rows.first.attribute('data-for-measure-id').value).to eq '2'
+      expect(displayed_variance_rows.first.attribute("data-for-measure-id").value).to eq "2"
 
-      displayed_variance_labels = subject.css('[data-variance-row-label]')
+      displayed_variance_labels = subject.css("[data-variance-row-label]")
       expect(displayed_variance_labels.count).to eq 1
-      expect(displayed_variance_labels.first.inner_text).to include 'Effective Leadership'
+      expect(displayed_variance_labels.first.inner_text).to include "Effective Leadership"
     end
   end
 
-  context 'when all the presenters have a non-nil score' do
+  context "when all the presenters have a non-nil score" do
     let(:variance_chart_row_presenters) do
-      measure = create(:measure, name: 'Display Me', measure_id: 'display-me')
+      measure = create(:measure, name: "Display Me", measure_id: "display-me")
       scale = create(:scale, measure:)
       create(:student_survey_item,
              scale:,
@@ -99,18 +99,18 @@ describe 'overview/index' do
       ]
     end
 
-    it 'does not display a note detailing which measures have insufficient responses for the given school & academic year' do
+    it "does not display a note detailing which measures have insufficient responses for the given school & academic year" do
-      expect(rendered).not_to match %r{Note: The following measures are not displayed due to limited availability of school admin data and/or low survey response rates}
+      expect(rendered).not_to match %r{Note: The following measures are not displayed due to limited availability of school data and/or low survey response rates}
     end
 
-    it 'displays a variance row for each presenter' do
+    it "displays a variance row for each presenter" do
-      displayed_variance_rows = subject.css('[data-for-measure-id]')
+      displayed_variance_rows = subject.css("[data-for-measure-id]")
       expect(displayed_variance_rows.count).to eq 1
-      expect(displayed_variance_rows.first.attribute('data-for-measure-id').value).to eq 'display-me'
+      expect(displayed_variance_rows.first.attribute("data-for-measure-id").value).to eq "display-me"
 
-      displayed_variance_labels = subject.css('[data-variance-row-label]')
+      displayed_variance_labels = subject.css("[data-variance-row-label]")
       expect(displayed_variance_labels.count).to eq 1
-      expect(displayed_variance_labels.first.inner_text).to include 'Display Me'
+      expect(displayed_variance_labels.first.inner_text).to include "Display Me"
     end
   end
 end

spec/views/overview/variance_chart.html.erb_spec.rb

@@ -1,14 +1,14 @@
-require 'rails_helper'
+require "rails_helper"
 include VarianceHelper
 
-describe 'overview/_variance_chart.html.erb' do
+describe "overview/_variance_chart.html.erb" do
   before do
     @academic_year = create(:academic_year)
     @district = create(:district)
     @school = create(:school)
   end
 
-  context 'When there are scores to show' do
+  context "When there are scores to show" do
     subject { Nokogiri::HTML(rendered) }
 
     let(:survey_items1) { [create(:student_survey_item)] }
@@ -31,24 +31,24 @@ describe 'overview/_variance_chart.html.erb' do
         VarianceChartRowPresenter.new(measure: higher_scoring_measure, score: Score.new(average: 5))
       ]
 
-      render partial: 'variance_chart', locals: { presenters: }
+      render partial: "variance_chart", locals: { presenters: }
     end
 
-    it 'displays higher scoring measures above lower scoring measures' do
+    it "displays higher scoring measures above lower scoring measures" do
-      measure_row_bars = subject.css('rect.measure-row-bar')
+      measure_row_bars = subject.css("rect.measure-row-bar")
 
       higher_scoring_measure_index = measure_row_bars.find_index do |bar|
-        bar['data-for-measure-id'] == higher_scoring_measure.measure_id
+        bar["data-for-measure-id"] == higher_scoring_measure.measure_id
       end
       lower_scoring_measure_index = measure_row_bars.find_index do |bar|
-        bar['data-for-measure-id'] == lower_scoring_measure.measure_id
+        bar["data-for-measure-id"] == lower_scoring_measure.measure_id
       end
 
       expect(higher_scoring_measure_index).to be < lower_scoring_measure_index
     end
   end
 
-  context 'When there are no scores to show for any measures' do
+  context "When there are no scores to show for any measures" do
     before :each do
       measure_lacking_score = create(:measure)
       another_measure_lacking_score = create(:measure)
@@ -57,15 +57,15 @@ describe 'overview/_variance_chart.html.erb' do
         VarianceChartRowPresenter.new(measure: another_measure_lacking_score, score: Score.new(average: nil))
       ]
 
-      render partial: 'variance_chart', locals: { presenters: }
+      render partial: "variance_chart", locals: { presenters: }
     end
 
     it "displays the text 'insufficient data' for an empty dataset" do
-      expect(rendered).to have_text 'Insufficient data'
+      expect(rendered).to have_text "Insufficient data"
     end
 
-    it "does not display the partial data text: 'The following measures are not displayed due to limited availability of school admin data and/or low survey response rates:' " do
+    it "does not display the partial data text: 'The following measures are not displayed due to limited availability of school data and/or low survey response rates:' " do
-      expect(rendered).not_to have_text 'The following measures are not displayed due to limited availability of school admin data and/or low survey response rates:'
+      expect(rendered).not_to have_text "The following measures are not displayed due to limited availability of school data and/or low survey response rates:"
     end
   end
 end