- <%= render partial: "focus_area", locals: {categories: @presenter.categories, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategories: @presenter.subcategories} %>
- <%= render partial: "school_years", locals: {available_academic_years: @presenter.academic_years, selected_academic_years: @presenter.selected_academic_years, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory, measures: @presenter.measures, graph: @presenter.graph} %>
- <%= render partial: "data_filters", locals: {district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory} %>
+ <%= render partial: "focus_area", locals: {categories: @presenter.categories, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategories: @presenter.subcategories} %>
+ <%= render partial: "school_years", locals: {available_academic_years: @presenter.academic_years, selected_academic_years: @presenter.selected_academic_years, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory, measures: @presenter.measures, graph: @presenter.graph} %>
+ <%= render partial: "data_filters", locals: {district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory} %>
<% cache [@school, @presenter.cache_objects] do %>
+
<% @presenter.measures.each do |measure| %>
<%= link_to("MEASURE " + measure.measure_id.upcase, district_school_category_path( @district, @school, @presenter.category, {year: @presenter.selected_academic_years&.last&.range , anchor: "#{measure.measure_id}"}), class: "construct-id", data: {turbo_frame: "_top"}) %>
<%= measure.name %>
- <%= render partial: "grouped_bar_chart" , locals: { measure: measure} %>
+ <%= render partial: "grouped_bar_chart" , locals: { measure: measure, columns: @presenter.graph.columns} %>
+
+ <% if @presenter.show_secondary_graph?(measure:) %>
+
+ <%= link_to("Parent Survey", district_school_category_path( @district, @school, @presenter.category, {year: @presenter.selected_academic_years&.last&.range , anchor: "#{measure.measure_id}"}), class: "construct-id", data: {turbo_frame: "_top"}) %>
+ <%= measure.subcategory.name %>
+ <%= render partial: "grouped_bar_chart" , locals: { measure: measure, columns: @presenter.columns_for_measure(measure:)} %>
+
+ <% end %>
+
<% end %>
<% end %>
diff --git a/spec/models/analyze/graph/column/GenderColumn/unknown_spec.rb b/spec/models/analyze/graph/column/GenderColumn/unknown_spec.rb
deleted file mode 100644
index 0877c603..00000000
--- a/spec/models/analyze/graph/column/GenderColumn/unknown_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Analyze::Graph::Column::GenderColumn::Unknown, type: :model do
- let(:school) { create(:school) }
- let(:academic_year) { create(:academic_year) }
- let(:measure) { create(:measure) }
- let(:academic_years) { [academic_year] }
- let(:position) { 0 }
- let(:number_of_columns) { 1 }
- let(:gender) { create(:gender, qualtrics_code: 99) }
-
- let(:subcategory) { create(:subcategory, subcategory_id: "1A") }
- let(:measure) { create(:measure, measure_id: "1A-iii", subcategory:) }
- let(:scale) { create(:student_scale, measure:) }
- let(:survey_item) { create(:student_survey_item, scale:) }
- let(:teacher_scale) { create(:teacher_scale, measure:) }
- let(:teacher_survey_item) { create(:teacher_survey_item, scale:) }
-
- context "when no teacher responses exist" do
- context "when there are insufficient unknown students" do
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(nil)
- end
- it "reports insufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(false)
- end
- end
- context "when there are sufficient unknown students" do
- before :each do
- create_list(:survey_item_response, 10, school:, academic_year:, gender:, survey_item:)
- end
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(3)
- end
-
- it "reports sufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(true)
- end
- end
- end
-
- context "when teacher responses exist" do
- before :each do
- create_list(:survey_item_response, 10, school:, academic_year:, survey_item: teacher_survey_item, likert_score: 5)
- end
-
- context "when there are insufficient unknown students" do
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(nil)
- end
- it "reports insufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(false)
- end
- end
- context "when there are sufficient unknown students" do
- before :each do
- create_list(:survey_item_response, 10, school:, academic_year:, gender:, survey_item:)
- end
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(3)
- end
-
- it "reports sufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(true)
- end
- end
- end
-end
-
diff --git a/spec/models/analyze/graph/column/gender.rb b/spec/models/analyze/graph/column/gender.rb
new file mode 100644
index 00000000..f0a7453c
--- /dev/null
+++ b/spec/models/analyze/graph/column/gender.rb
@@ -0,0 +1,74 @@
+require "rails_helper"
+include Analyze::Graph::Column
+
+RSpec.describe Gender, type: :model do
+ let(:school) { create(:school) }
+ let(:academic_year) { create(:academic_year) }
+ let(:measure) { create(:measure) }
+ let(:academic_years) { [academic_year] }
+ let(:position) { 0 }
+ let(:number_of_columns) { 1 }
+ let(:gender) { create(:gender, qualtrics_code: 99) }
+
+ let(:subcategory) { create(:subcategory, subcategory_id: "1A") }
+ let(:measure) { create(:measure, measure_id: "1A-iii", subcategory:) }
+ let(:scale) { create(:student_scale, measure:) }
+ let(:survey_item) { create(:student_survey_item, scale:) }
+ let(:teacher_scale) { create(:teacher_scale, measure:) }
+ let(:teacher_survey_item) { create(:teacher_survey_item, scale:) }
+ let(:config) { Analyze::Graph::Column::Gender.new(gender: ::Gender.find_by_qualtrics_code(99)) }
+
+ context "when no teacher responses exist" do
+ context "when there are insufficient unknown students" do
+ it "reports a score of 3 when the average is 3" do
+ expect(GroupedBarColumnPresenter.new(school:, academic_years:, position:, measure:,
+ number_of_columns:, config:).score(academic_year:).average).to eq(nil)
+ end
+ it "reports insufficient data" do
+ expect(config.sufficient_student_responses?(measure:, school:, academic_year:)).to eq(false)
+ end
+ end
+ context "when there are sufficient unknown students" do
+ before :each do
+ create_list(:survey_item_response, 10, school:, academic_year:, gender:, survey_item:)
+ end
+ it "reports a score of 3 when the average is 3" do
+ expect(GroupedBarColumnPresenter.new(school:, academic_years:, position:, measure:,
+ number_of_columns:, config:).score(academic_year:).average).to eq(3)
+ end
+
+ it "reports sufficient data" do
+ expect(config.sufficient_student_responses?(measure:, school:, academic_year:)).to eq(true)
+ end
+ end
+ end
+
+ context "when teacher responses exist" do
+ before :each do
+ create_list(:survey_item_response, 10, school:, academic_year:, survey_item: teacher_survey_item, likert_score: 5)
+ end
+
+ context "when there are insufficient unknown students" do
+ it "reports a score of 3 when the average is 3" do
+ expect(GroupedBarColumnPresenter.new(school:, academic_years:, position:, measure:,
+ number_of_columns:, config:).score(academic_year:).average).to eq(nil)
+ end
+ it "reports insufficient data" do
+ expect(config.sufficient_student_responses?(measure:, school:, academic_year:)).to eq(false)
+ end
+ end
+ context "when there are sufficient unknown students" do
+ before :each do
+ create_list(:survey_item_response, 10, school:, academic_year:, gender:, survey_item:)
+ end
+ it "reports a score of 3 when the average is 3" do
+ expect(GroupedBarColumnPresenter.new(school:, academic_years:, position:, measure:,
+ number_of_columns:, config:).score(academic_year:).average).to eq(3)
+ end
+
+ it "reports sufficient data" do
+ expect(config.sufficient_student_responses?(measure:, school:, academic_year:)).to eq(true)
+ end
+ end
+ end
+end
diff --git a/spec/models/analyze/graph/column/gender_column/unknown_spec.rb b/spec/models/analyze/graph/column/gender_column/unknown_spec.rb
deleted file mode 100644
index defb9d01..00000000
--- a/spec/models/analyze/graph/column/gender_column/unknown_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Analyze::Graph::Column::GenderColumn::Unknown, type: :model do
- let(:school) { create(:school) }
- let(:academic_year) { create(:academic_year) }
- let(:measure) { create(:measure) }
- let(:academic_years) { [academic_year] }
- let(:position) { 0 }
- let(:number_of_columns) { 1 }
- let(:gender) { create(:gender, qualtrics_code: 99) }
-
- let(:subcategory) { create(:subcategory, subcategory_id: "1A") }
- let(:measure) { create(:measure, measure_id: "1A-iii", subcategory:) }
- let(:scale) { create(:student_scale, measure:) }
- let(:survey_item) { create(:student_survey_item, scale:) }
- let(:teacher_scale) { create(:teacher_scale, measure:) }
- let(:teacher_survey_item) { create(:teacher_survey_item, scale:) }
-
- context "when no teacher responses exist" do
- context "when there are insufficient unknown students" do
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(nil)
- end
- it "reports insufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(false)
- end
- end
- context "when there are sufficient unknown students" do
- before :each do
- create_list(:survey_item_response, 10, school:, academic_year:, gender:, survey_item:)
- end
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(3)
- end
-
- it "reports sufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(true)
- end
- end
- end
-
- context "when teacher responses exist" do
- before :each do
- create_list(:survey_item_response, 10, school:, academic_year:, survey_item: teacher_survey_item, likert_score: 5)
- end
-
- context "when there are insufficient unknown students" do
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(nil)
- end
- it "reports insufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(false)
- end
- end
- context "when there are sufficient unknown students" do
- before :each do
- create_list(:survey_item_response, 10, school:, academic_year:, gender:, survey_item:)
- end
- it "reports a score of 3 when the average is 3" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).score(academic_year).average).to eq(3)
- end
-
- it "reports sufficient data" do
- expect(Analyze::Graph::Column::GenderColumn::Unknown.new(school:, academic_years:, position:, measure:,
- number_of_columns:).sufficient_student_responses?(academic_year:)).to eq(true)
- end
- end
- end
-end
diff --git a/spec/presenters/analyze/graph/column/all_admin_spec.rb b/spec/presenters/analyze/graph/column/all_admin_spec.rb
deleted file mode 100644
index 7c7df87a..00000000
--- a/spec/presenters/analyze/graph/column/all_admin_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'rails_helper'
-include Analyze::Graph::Column
-
-describe AllAdmin do
- let(:measure_without_admin) { create(:measure) }
- let(:measure_with_admin) { create(:measure, :with_admin_data_items) }
- let(:school) { create(:school) }
- let(:academic_years) { [create(:academic_year)] }
- let(:position) { 1 }
- let(:number_of_columns) { 1 }
-
- context '.show_irrelevancy_message?' do
- it 'returns true when the measure does NOT include admin data items' do
- expect(AllAdmin.new(measure: measure_without_admin, school:, academic_years:, position:,
- number_of_columns:).show_irrelevancy_message?).to eq true
- end
-
- it 'returns false when the measure includes admin data items' do
- expect(AllAdmin.new(measure: measure_with_admin, school:, academic_years:, position:,
- number_of_columns:).show_irrelevancy_message?).to eq false
- end
- end
-
- context '.show_insufficient_data_message?' do
- context 'when the measure DOES NOT include admin data items' do
- it 'returns true ' do
- expect(AllAdmin.new(measure: measure_without_admin, school:, academic_years:, position:,
- number_of_columns:).show_insufficient_data_message?).to eq true
- end
-
- it 'returns true when the measure does include admin data items but there are not values assigned to the admin' do
- expect(AllAdmin.new(measure: measure_with_admin, school:, academic_years:, position:,
- number_of_columns:).show_insufficient_data_message?).to eq true
- end
- end
-
- context 'when the measure Does include admin data items' do
- it 'and has at least one value to show, it will return false' do
- admin_data_item = measure_with_admin.scales.first.admin_data_items.first
- create(:admin_data_value, admin_data_item:, school:, academic_year: academic_years.first)
-
- expect(AllAdmin.new(measure: measure_with_admin, school:, academic_years:, position:,
- number_of_columns:).show_insufficient_data_message?).to eq false
- end
- end
- end
-end
diff --git a/spec/presenters/analyze/graph/column/gender/female_spec.rb b/spec/presenters/analyze/graph/column/gender/female_spec.rb
deleted file mode 100644
index a9dd8eed..00000000
--- a/spec/presenters/analyze/graph/column/gender/female_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'rails_helper'
-include Analyze::Graph
-include Analyze::Graph::Column::GenderColumn
-describe StudentsByRace do
- let(:female) { create(:gender, qualtrics_code: 1, designation: 'Female') }
- let(:school) { create(:school) }
- let(:academic_year) { create(:academic_year, range: '1900-01') }
- let(:academic_years) { [academic_year] }
- let(:year_index) { academic_years.find_index(academic_year) }
-
- let(:measure_with_student_survey_items) { create(:measure, name: 'Student measure') }
- let(:scale_with_student_survey_item) { create(:student_scale, measure: measure_with_student_survey_items) }
- let(:student_survey_item) do
- create(:student_survey_item, scale: scale_with_student_survey_item)
- end
-
- before do
- create_list(:survey_item_response, 1, survey_item: student_survey_item, school:, academic_year:, gender: female)
- end
-
- context '.gender' do
- it 'returns female gender' do
- expect(Female.new(measure: measure_with_student_survey_items, school:, academic_years:, position: year_index,
- number_of_columns: 1).gender).to eq female
- end
-
- it 'returns the count of survey items for females for that school and academic_year ' do
- female_column = Female.new(measure: measure_with_student_survey_items, school:, academic_years:, position: year_index,
- number_of_columns: 1)
- expect(female_column.sufficient_student_responses?(academic_year:)).to eq false
- end
-
- context 'when there are more than 10 students who responded' do
- before do
- create_list(:survey_item_response, 10, survey_item: student_survey_item, school:, academic_year:,
- gender: female)
- end
- it 'returns the count of survey items for females for that school and academic_year ' do
- female_column = Female.new(measure: measure_with_student_survey_items, school:, academic_years:, position: year_index,
- number_of_columns: 1)
- expect(female_column.sufficient_student_responses?(academic_year:)).to eq true
- end
- end
- end
-end
diff --git a/spec/presenters/analyze/graph/students_by_race_spec.rb b/spec/presenters/analyze/graph/students_by_race_spec.rb
index 5f78582c..978a19ec 100644
--- a/spec/presenters/analyze/graph/students_by_race_spec.rb
+++ b/spec/presenters/analyze/graph/students_by_race_spec.rb
@@ -1,23 +1,23 @@
require 'rails_helper'
include Analyze::Graph
include Analyze::Graph::Column
-include Analyze::Graph::Column::RaceColumn
+
describe StudentsByRace do
- let(:american_indian) { create(:race, qualtrics_code: 1) }
- let(:asian) { create(:race, qualtrics_code: 2) }
- let(:black) { create(:race, qualtrics_code: 3) }
- let(:hispanic) { create(:race, qualtrics_code: 4) }
- let(:white) { create(:race, qualtrics_code: 5) }
- let(:unknown) { create(:race, qualtrics_code: 99) }
- let(:multiracial) { create(:race, qualtrics_code: 100) }
+ let(:american_indian) { create(:race, designation: "american indian", qualtrics_code: 1) }
+ let(:asian) { create(:race, designation: "asian", qualtrics_code: 2) }
+ let(:black) { create(:race, designation: "black", qualtrics_code: 3) }
+ let(:hispanic) { create(:race, designation: "hispanic", qualtrics_code: 4) }
+ let(:white) { create(:race, designation: "white", qualtrics_code: 5) }
+ let(:unknown) { create(:race, designation: "unknown", qualtrics_code: 99) }
+ let(:multiracial) { create(:race, designation: "multiracial", qualtrics_code: 100) }
context 'when initialized with a list of races' do
it 'generates corresponding race columns' do
races = [american_indian]
- expect(StudentsByRace.new(races:).columns).to eq [AmericanIndian, AllStudent]
+ expect(StudentsByRace.new(races:).columns.map(&:label).map { |words| words.join(" ") }).to eq ["american indian", "All Students"]
races = [american_indian, asian]
- expect(StudentsByRace.new(races:).columns).to eq [AmericanIndian, Asian, AllStudent]
+ expect(StudentsByRace.new(races:).columns.map(&:label).map { |words| words.join(" ") }).to eq ["american indian", "asian", "All Students"]
races = [black, hispanic, multiracial]
- expect(StudentsByRace.new(races:).columns).to eq [Black, Hispanic, Multiracial, AllStudent]
+ expect(StudentsByRace.new(races:).columns.map(&:label).map { |words| words.join(" ") }).to eq ["black", "hispanic", "multiracial", "All Students"]
end
end
end
diff --git a/spec/presenters/grouped_bar_column_presenter_spec.rb b/spec/presenters/grouped_bar_column_presenter_spec.rb
index 194e1218..6b8818a8 100644
--- a/spec/presenters/grouped_bar_column_presenter_spec.rb
+++ b/spec/presenters/grouped_bar_column_presenter_spec.rb
@@ -63,18 +63,18 @@ describe GroupedBarColumnPresenter do
end
let(:student_presenter) do
- Analyze::Graph::Column::AllStudent.new measure: measure_with_student_survey_items, school:, academic_years:,
- position: 0, number_of_columns: 3
+ GroupedBarColumnPresenter.new measure: measure_with_student_survey_items, school:, academic_years:,
+ position: 0, number_of_columns: 3, config: Analyze::Graph::Column::AllStudent.new
end
let(:teacher_presenter) do
- Analyze::Graph::Column::AllTeacher.new measure: measure_with_teacher_survey_items, school:, academic_years:,
- position: 0, number_of_columns: 3
+ GroupedBarColumnPresenter.new measure: measure_with_teacher_survey_items, school:, academic_years:,
+ position: 0, number_of_columns: 3, config: Analyze::Graph::Column::AllTeacher.new
end
let(:all_data_presenter) do
- Analyze::Graph::Column::AllData.new measure: measure_composed_of_student_and_teacher_items, school:, academic_years:,
- position: 0, number_of_columns: 3
+ GroupedBarColumnPresenter.new measure: measure_composed_of_student_and_teacher_items, school:, academic_years:,
+ position: 0, number_of_columns: 3, config: Analyze::Graph::Column::AllData.new
end
before do
@@ -120,8 +120,8 @@ describe GroupedBarColumnPresenter do
end
it "returns a score that is an average of the likert scores " do
- expect(all_data_presenter.score(academic_year).average).to eq 4.5
- expect(all_data_presenter.score(another_academic_year).average).to eq nil
+ expect(all_data_presenter.score(academic_year:).average).to eq 4.5
+ expect(all_data_presenter.score(academic_year: another_academic_year).average).to eq nil
expect(all_data_presenter.academic_years[0].range).to be academic_year.range
expect(all_data_presenter.academic_years[1].range).to be another_academic_year.range
end
@@ -133,8 +133,8 @@ describe GroupedBarColumnPresenter do
academic_year: another_academic_year, likert_score: 3)
end
it "returns independent scores for each year of data" do
- expect(all_data_presenter.score(academic_year).average).to eq 4.5
- expect(all_data_presenter.score(another_academic_year).average).to eq 4
+ expect(all_data_presenter.score(academic_year:).average).to eq 4.5
+ expect(all_data_presenter.score(academic_year: another_academic_year).average).to eq 4
end
end
end
@@ -145,7 +145,7 @@ describe GroupedBarColumnPresenter do
it_behaves_like "column_midpoint"
it "returns an emty score" do
- expect(student_presenter.score(academic_year).average).to eq nil
+ expect(student_presenter.score(academic_year:).average).to eq nil
end
it "shows the irrelevancy message " do