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

rpp-main
Nelson Jovel 2 years ago
parent 4c1713e538
commit 59b7416a3a

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

@ -9,7 +9,7 @@
<div class="d-flex flex-column mx-7"> <div class="d-flex flex-column mx-7">
<p class="body-large "><%= subcategory.description %></p> <p class="body-large "><%= subcategory.description %></p>
<div class="d-flex justify-content-start"> <div class="d-flex justify-content-start">
<div <div
class="body-large text-center response-rate" class="body-large text-center response-rate"
data-bs-toggle="popover" data-bs-toggle="popover"
data-bs-trigger="hover focus" data-bs-trigger="hover focus"
@ -17,9 +17,9 @@
data-bs-placement="bottom" data-bs-placement="bottom"
> >
<p class="response-rate-percentage"><%= subcategory.admin_collection_rate.first %> / <%= subcategory.admin_collection_rate.last %></p> <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>
<div <div
class="body-large mx-3 text-center response-rate" class="body-large mx-3 text-center response-rate"
data-bs-toggle="popover" data-bs-toggle="popover"
data-bs-trigger="hover focus" data-bs-trigger="hover focus"
@ -29,7 +29,7 @@
<p class="response-rate-percentage"><%= subcategory.student_response_rate %></p> <p class="response-rate-percentage"><%= subcategory.student_response_rate %></p>
<p>of students responded</p> <p>of students responded</p>
</div> </div>
<div <div
class="body-large text-center response-rate" class="body-large text-center response-rate"
data-bs-toggle="popover" data-bs-toggle="popover"
data-bs-trigger="hover focus" data-bs-trigger="hover focus"

@ -1,5 +1,5 @@
<div class="subcategory-card__benchmark-item"> <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> <use class="harvey-ball harvey-ball--<%= subcategory_card.color %>" xlink:href="#<%= subcategory_card.harvey_ball_icon %>"></use>
</svg> </svg>

@ -2,7 +2,7 @@
<% not_displayed_presenters = presenters - displayed_presenters %> <% not_displayed_presenters = presenters - displayed_presenters %>
<% if displayed_presenters.none? %> <% 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? %> <% elsif not_displayed_presenters.present? %>
<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> <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 %> <% end %>

@ -26,9 +26,9 @@ describe MeasurePresenter do
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, create_list(:survey_item_response, SurveyItemResponse::TEACHER_RESPONSE_THRESHOLD, survey_item: survey_item1,
academic_year:, school:, likert_score: 1) academic_year:, school:, likert_score: 1)
create_list(:survey_item_response, SurveyItemResponse::TEACHER_RESPONSE_THRESHOLD, survey_item: survey_item2, create_list(:survey_item_response, SurveyItemResponse::TEACHER_RESPONSE_THRESHOLD, survey_item: survey_item2,
academic_year:, school:, likert_score: 5) academic_year:, school:, likert_score: 5)
end 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
@ -61,7 +61,7 @@ describe MeasurePresenter do
second_data_item_presenter = measure_presenter.data_item_presenters[1] 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 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"
end end
end end
@ -72,9 +72,9 @@ describe MeasurePresenter do
student_survey_item = create(:student_survey_item, scale: student_scale) student_survey_item = create(:student_survey_item, scale: student_scale)
create_list(:survey_item_response, SurveyItemResponse::TEACHER_RESPONSE_THRESHOLD, create_list(:survey_item_response, SurveyItemResponse::TEACHER_RESPONSE_THRESHOLD,
survey_item: teacher_survey_item, academic_year:, school:) survey_item: teacher_survey_item, academic_year:, school:)
create_list(:survey_item_response, SurveyItemResponse::STUDENT_RESPONSE_THRESHOLD - 1, create_list(:survey_item_response, SurveyItemResponse::STUDENT_RESPONSE_THRESHOLD - 1,
survey_item: student_survey_item, academic_year:, school:) survey_item: student_survey_item, academic_year:, school:)
end end
it "tracks which parts of the data are sufficient" do it "tracks which parts of the data are sufficient" do
@ -104,7 +104,7 @@ describe MeasurePresenter do
presenter.title == "Student survey" presenter.title == "Student survey"
end end
admin_data_item_presenter = measure_presenter.data_item_presenters.find do |presenter| admin_data_item_presenter = measure_presenter.data_item_presenters.find do |presenter|
presenter.title == "School Data" presenter.title == "School data"
end 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"

@ -1,11 +1,11 @@
require 'rails_helper' require "rails_helper"
include VarianceHelper include VarianceHelper
describe 'overview/index' do describe "overview/index" do
subject { Nokogiri::HTML(rendered) } subject { Nokogiri::HTML(rendered) }
let(:support_for_teaching) do 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:) scale = create(:scale, measure:)
create(:student_survey_item, create(:student_survey_item,
scale:, scale:,
@ -17,7 +17,7 @@ describe 'overview/index' do
end end
let(:effective_leadership) do 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:) scale = create(:scale, measure:)
create(:teacher_survey_item, create(:teacher_survey_item,
scale:, scale:,
@ -29,7 +29,7 @@ describe 'overview/index' do
end end
let(:professional_qualifications) do 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:) scale = create(:scale, measure:)
create(:admin_data_item, create(:admin_data_item,
scale:, scale:,
@ -59,7 +59,7 @@ describe 'overview/index' do
render render
end 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 let(:variance_chart_row_presenters) do
[ [
VarianceChartRowPresenter.new(measure: support_for_teaching, score: Score.new), VarianceChartRowPresenter.new(measure: support_for_teaching, score: Score.new),
@ -68,24 +68,24 @@ describe 'overview/index' do
] ]
end 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 data and/or low survey response rates: Support For Teaching Development &amp; 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 &amp; Growth; Professional Qualifications.}
end 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.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.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
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 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:) scale = create(:scale, measure:)
create(:student_survey_item, create(:student_survey_item,
scale:, scale:,
@ -99,18 +99,18 @@ describe 'overview/index' do
] ]
end 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 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 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.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.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 end
end end

@ -1,14 +1,14 @@
require 'rails_helper' require "rails_helper"
include VarianceHelper include VarianceHelper
describe 'overview/_variance_chart.html.erb' do describe "overview/_variance_chart.html.erb" do
before do before do
@academic_year = create(:academic_year) @academic_year = create(:academic_year)
@district = create(:district) @district = create(:district)
@school = create(:school) @school = create(:school)
end end
context 'When there are scores to show' do context "When there are scores to show" do
subject { Nokogiri::HTML(rendered) } subject { Nokogiri::HTML(rendered) }
let(:survey_items1) { [create(:student_survey_item)] } 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)) VarianceChartRowPresenter.new(measure: higher_scoring_measure, score: Score.new(average: 5))
] ]
render partial: 'variance_chart', locals: { presenters: } render partial: "variance_chart", locals: { presenters: }
end 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| 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 end
lower_scoring_measure_index = measure_row_bars.find_index do |bar| 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 end
expect(higher_scoring_measure_index).to be < lower_scoring_measure_index expect(higher_scoring_measure_index).to be < lower_scoring_measure_index
end end
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 before :each do
measure_lacking_score = create(:measure) measure_lacking_score = create(:measure)
another_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)) 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 end
it "displays the text 'insufficient data' for an empty dataset" do 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 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 end
end end

Loading…
Cancel
Save