diff --git a/app/assets/stylesheets/sqm_application.scss b/app/assets/stylesheets/sqm_application.scss index 099f6400..1661ee95 100644 --- a/app/assets/stylesheets/sqm_application.scss +++ b/app/assets/stylesheets/sqm_application.scss @@ -23,6 +23,17 @@ box-shadow: 0 0 6px rgba($black, 0.25); } +.construct-id { + @extend .font-cabin; + @extend .weight-700; + + text-transform: uppercase; + letter-spacing: 0.1em; + font-size: 14px; + color: $gray-1; + line-height: 18px; +} + .subcategory-section { @extend .mt-5; @extend .bg-color-white; diff --git a/app/presenters/category_presenter.rb b/app/presenters/category_presenter.rb index 06f6b047..dd63ace3 100644 --- a/app/presenters/category_presenter.rb +++ b/app/presenters/category_presenter.rb @@ -3,6 +3,10 @@ class CategoryPresenter @category = category end + def id + @category.category_id + end + def name @category.name end diff --git a/app/presenters/measure_presenter.rb b/app/presenters/measure_presenter.rb index 241b5ad9..dc31e35c 100644 --- a/app/presenters/measure_presenter.rb +++ b/app/presenters/measure_presenter.rb @@ -5,6 +5,10 @@ class MeasurePresenter @school = school end + def id + @measure.measure_id + end + def name @measure.name end diff --git a/app/presenters/subcategory_presenter.rb b/app/presenters/subcategory_presenter.rb index fa9c4e89..ec66fb47 100644 --- a/app/presenters/subcategory_presenter.rb +++ b/app/presenters/subcategory_presenter.rb @@ -5,6 +5,10 @@ class SubcategoryPresenter @school = school end + def id + @subcategory.subcategory_id + end + def name @subcategory.name end diff --git a/app/views/categories/_measures_section.html.erb b/app/views/categories/_measures_section.html.erb index 3f0832f0..d9e534c8 100644 --- a/app/views/categories/_measures_section.html.erb +++ b/app/views/categories/_measures_section.html.erb @@ -1,4 +1,5 @@
Measure <%= measure_presenter.id %>
Subcategory <%= subcategory.id %>
Category <%= @category.id %>
<%= @category.description %>
diff --git a/spec/presenters/category_presenter_spec.rb b/spec/presenters/category_presenter_spec.rb index 7f352a37..4532c2d5 100644 --- a/spec/presenters/category_presenter_spec.rb +++ b/spec/presenters/category_presenter_spec.rb @@ -5,7 +5,7 @@ describe CategoryPresenter do subcategory1 = Subcategory.new(name: 'A subcategory') subcategory2 = Subcategory.new(name: 'Another subcategory') - category = Category.new(name: 'Some Category', subcategories: [subcategory1, subcategory2], description: 'A description for some Category', short_description: 'A short description for some Category') + category = Category.new(name: 'Some Category', subcategories: [subcategory1, subcategory2], description: 'A description for some Category', short_description: 'A short description for some Category', category_id: '1') return CategoryPresenter.new(category: category) end @@ -38,10 +38,11 @@ describe CategoryPresenter do DatabaseCleaner.clean end - it 'returns the name and description of the category' do + it 'returns the name, id and description of the category' do expect(category_presenter.name).to eq 'Some Category' expect(category_presenter.description).to eq 'A description for some Category' expect(category_presenter.short_description).to eq 'A short description for some Category' + expect(category_presenter.id).to eq '1' end it 'maps subcategories to subcategory presenters' do diff --git a/spec/presenters/measure_presenter_spec.rb b/spec/presenters/measure_presenter_spec.rb index ebbd6927..2fa0b2f1 100644 --- a/spec/presenters/measure_presenter_spec.rb +++ b/spec/presenters/measure_presenter_spec.rb @@ -6,6 +6,10 @@ describe MeasurePresenter do let(:measure) { create(:measure, measure_id: 'measure-id') } let(:measure_presenter) { MeasurePresenter.new(measure: measure, academic_year: academic_year, school: school) } + it 'returns the id of the measure' do + expect(measure_presenter.id).to eq 'measure-id' + end + 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' end diff --git a/spec/presenters/subcategory_presenter_spec.rb b/spec/presenters/subcategory_presenter_spec.rb index dcb41f94..01847447 100644 --- a/spec/presenters/subcategory_presenter_spec.rb +++ b/spec/presenters/subcategory_presenter_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' describe SubcategoryPresenter do let(:academic_year) { create(:academic_year, range: '1989-90') } let(:school) { create(:school, name: 'Best School') } - let(:subcategory) { create(:subcategory, name: 'A great subcategory', description: 'A great description') } + let(:subcategory) { create(:subcategory, name: 'A great subcategory', subcategory_id: 'A', description: 'A great description') } let(:subcategory_presenter) do measure1 = create(:measure, watch_low_benchmark: 4, growth_low_benchmark: 4.25, approval_low_benchmark: 4.5, ideal_low_benchmark: 4.75, subcategory: subcategory) survey_item1 = create(:teacher_survey_item, measure: measure1) @@ -31,6 +31,10 @@ describe SubcategoryPresenter do expect(subcategory_presenter.description).to eq 'A great description' end + it 'returns the id of the subcategory' do + expect(subcategory_presenter.id).to eq 'A' + end + it 'returns a gauge presenter responsible for the aggregate survey item response likert scores' do expect(subcategory_presenter.gauge_presenter.title).to eq 'Growth' end