From 09300fdc5c95da94902da24d0050d4fafd1257e5 Mon Sep 17 00:00:00 2001 From: JG Date: Tue, 14 Jun 2022 06:18:46 +0100 Subject: [PATCH] better view, seeds and factory --- app/models/scheme.rb | 2 +- app/views/schemes/show.html.erb | 11 +++++------ db/seeds.rb | 27 ++++++++++++++++++++++++--- spec/factories/scheme.rb | 2 +- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 7d226689c..14de2edc9 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -66,7 +66,7 @@ class Scheme < ApplicationRecord { name: "Registered under Care Standards Act 2000", value: registered_under_care_act_display }, { name: "Total number of units", value: total_units }, { name: "Primary client group", value: primary_client_group_display }, - { name: "Secondary client group", value: primary_client_group_display }, + { name: "Secondary client group", value: secondary_client_group_display }, { name: "Level of support given", value: support_type_display }, { name: "Intended length of stay", value: intended_stay_display }, ] diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb index 694b61bc7..bb883d0e9 100644 --- a/app/views/schemes/show.html.erb +++ b/app/views/schemes/show.html.erb @@ -1,11 +1,10 @@ +<% title = @scheme.service_name %> +<% content_for :title, title %> + +<%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %> +
-

- <%= content_for("Test") %> -

-

- Scheme Result -

<%= govuk_summary_list do |summary_list| %> <% @scheme.display_attributes.each do |attr| %> <%= summary_list.row do |row| %> diff --git a/db/seeds.rb b/db/seeds.rb index 992de72ae..5ab572a29 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -73,24 +73,45 @@ unless Rails.env.test? Scheme.create!( code: "S878", service_name: "Beulahside Care", + sensitive: true, + registered_under_care_act: 0, + support_type: 1, + scheme_type: 4, + total_units: 5, + intended_stay: "M", + primary_client_group: "O", + secondary_client_group: "H", organisation: org, - primary_client_group: "G", created_at: Time.zone.now, ) Scheme.create!( code: "S312", service_name: "Abdullahview Point", + sensitive: false, + registered_under_care_act: 1, + support_type: 1, + scheme_type: 5, + total_units: 2, + intended_stay: "S", + primary_client_group: "D", + secondary_client_group: "E", organisation: org, - primary_client_group: "I", created_at: Time.zone.now, ) Scheme.create!( code: "7XYZ", service_name: "Caspermouth Center", - organisation: dummy_org, + sensitive: true, + registered_under_care_act: 1, + support_type: 4, + scheme_type: 7, + total_units: 7, + intended_stay: "X", primary_client_group: "G", + secondary_client_group: "R", + organisation: dummy_org, created_at: Time.zone.now, ) end diff --git a/spec/factories/scheme.rb b/spec/factories/scheme.rb index de1b660c7..66bf69216 100644 --- a/spec/factories/scheme.rb +++ b/spec/factories/scheme.rb @@ -3,7 +3,7 @@ FactoryBot.define do code { Faker::Name.initials(number: 4) } service_name { Faker::Name.name_with_middle } sensitive { Faker::Boolean.boolean } - registered_under_care_act { Faker::Boolean.boolean } + registered_under_care_act { Faker::Number.within(range: 0..1) } support_type { Faker::Number.within(range: 0..6) } scheme_type { %i[0 4 5 6 7].sample } total_units { Faker::Number.number(digits: 2) }