baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

correct and compact view for locations

pull/662/head
JG 3 years ago
parent
204165fa18
commit
a5b14958a3
5 changed files with 75 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      app/models/location.rb
  2. 62
      app/views/schemes/locations.html.erb
  3. 47
      db/seeds.rb
  4. 4
      spec/features/schemes_spec.rb
  5. 2
      spec/requests/schemes_controller_spec.rb

19
app/models/location.rb
Unescape View File

@ -1,3 +1,22 @@
class Location < ApplicationRecord class Location < ApplicationRecord
belongs_to :scheme belongs_to :scheme
WHEELCHAIR_ADAPTATION = {
0 => "No",
1 => "Yes",
}.freeze
def display_attributes
[
{ name: "Location code ", value: location_code, suffix: false },
{ name: "Postcode", value: postcode, suffix: county },
{ name: "Type of unit", value: type_of_unit, suffix: false },
{ name: "Type of building", value: type_of_building, suffix: false },
{ name: "Wheelchair adaptation", value: wheelchair_adaptation_display, suffix: false },
]
end
def wheelchair_adaptation_display
WHEELCHAIR_ADAPTATION[wheelchair_adaptation]
end
end end

62
app/views/schemes/locations.html.erb
Unescape View File

@ -5,15 +5,14 @@
<%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %> <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
<%= render SubNavigationComponent.new( <%= render SubNavigationComponent.new(
items: scheme_items(request.path, @scheme.id, @scheme.locations.count), items: scheme_items(request.path, @scheme.id, @scheme.locations.count),
) %> ) %>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="govuk-grid-column-three-quarters">
<section class="x-govuk-summary-card govuk-!-margin-bottom-6"> <% @scheme.locations.each do |location| %>
<% @scheme.locations.each do |location| %> <section class="x-govuk-summary-card govuk-!-margin-bottom-6">
<header class="x-govuk-summary-card__header"> <header class="x-govuk-summary-card__header">
<h2 class="x-govuk-summary-card__title"> <h2 class="x-govuk-summary-card__title">
<%= "#{location.address_line1}, #{location.address_line2}" %> <%= "#{location.address_line1}, #{location.address_line2}" %>
@ -21,49 +20,22 @@
</header> </header>
<div class="x-govuk-summary-card__body"> <div class="x-govuk-summary-card__body">
<dl class="govuk-summary-list"> <dl class="govuk-summary-list">
<div class="govuk-summary-list__row"> <% location.display_attributes.each do |attribute| %>
<dt class="govuk-summary-list__key"> <div class="govuk-summary-list__row">
Location code <dt class="govuk-summary-list__key">
</dt> <%= attribute[:name] %>
<dd class="govuk-summary-list__key"> </dt>
<%= location.location_code %> <dd class="govuk-summary-list__value app-!-font-tabular">
</dd> <span class="govuk-!-margin-right-4"><%= attribute[:value] %></span>
</div> <% if attribute[:suffix] %>
<div class="govuk-summary-list__row"> <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= attribute[:suffix] %></span>
<dt class="govuk-summary-list__key"> <% end %>
Postcode </dd>
</dt> </div>
<dd class="govuk-summary-list__key"> <% end %>
<%= location.postcode %>
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Type of unit
</dt>
<dd class="govuk-summary-list__key">
<%= location.type_of_unit %>
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Type of building
</dt>
<dd class="govuk-summary-list__key">
<%= location.type_of_building %>
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Wheelchair adaptation
</dt>
<dd class="govuk-summary-list__key">
<%= location.wheelchair_adaptation %>
</dd>
</div>
</dl> </dl>
</div> </div>
<% end %> </section>
</section> <% end %>
</div> </div>
</div> </div>

47
db/seeds.rb
Unescape View File

@ -70,7 +70,7 @@ unless Rails.env.test?
end end
if Rails.env.development? && Scheme.count.zero? if Rails.env.development? && Scheme.count.zero?
Scheme.create!( scheme1 = Scheme.create!(
code: "S878", code: "S878",
service_name: "Beulahside Care", service_name: "Beulahside Care",
sensitive: 0, sensitive: 0,
@ -85,7 +85,7 @@ unless Rails.env.test?
created_at: Time.zone.now, created_at: Time.zone.now,
) )
Scheme.create!( scheme2 = Scheme.create!(
code: "S312", code: "S312",
service_name: "Abdullahview Point", service_name: "Abdullahview Point",
sensitive: 0, sensitive: 0,
@ -100,7 +100,7 @@ unless Rails.env.test?
created_at: Time.zone.now, created_at: Time.zone.now,
) )
scheme = Scheme.create!( Scheme.create!(
code: "7XYZ", code: "7XYZ",
service_name: "Caspermouth Center", service_name: "Caspermouth Center",
sensitive: 1, sensitive: 1,
@ -115,16 +115,41 @@ unless Rails.env.test?
created_at: Time.zone.now, created_at: Time.zone.now,
) )
Location.create( Location.create!(
scheme: scheme, scheme: scheme1,
location_code: "7XYZ", location_code: "S254-CU193AA",
postcode: "ZX1 177", postcode: "CU19 3AA",
address_line1: "1 High street", address_line1: "Rectory Road",
address_line2: "London", address_line2: "North Chaim",
type_of_unit: "unit", type_of_unit: "Self-contained flat or bedsit",
type_of_building: "building", type_of_building: "Purpose-built",
county: "Mid Sussex",
wheelchair_adaptation: 0, wheelchair_adaptation: 0,
) )
Location.create!(
scheme: scheme1,
location_code: "S254-DM250DC",
postcode: "DM25 0DC",
address_line1: "Smithy Lane",
address_line2: "North Kellieworth",
type_of_unit: "Self-contained flat or bedsit with common facilities",
type_of_building: "Converted from previous residential or non-residential property",
county: "Fife",
wheelchair_adaptation: 1,
)
Location.create!(
scheme: scheme2,
location_code: "S254-YX130WP",
postcode: "YX13 0WP",
address_line1: "Smithy Lane",
address_line2: "East Darwin",
type_of_unit: "Shared house or hostel",
type_of_building: "Converted from previous residential or non-residential property",
county: "Rochford",
wheelchair_adaptation: 1,
)
end end
pp "Seeded 3 dummy schemes" pp "Seeded 3 dummy schemes"

4
spec/features/schemes_spec.rb
Unescape View File

@ -112,7 +112,7 @@ RSpec.describe "Schemes scheme Features" do
end end
context "when I click to see individual scheme" do context "when I click to see individual scheme" do
let(:scheme) { schemes.first } let(:scheme) { schemes.first }
before do before do
click_link(scheme.service_name) click_link(scheme.service_name)
@ -134,7 +134,7 @@ RSpec.describe "Schemes scheme Features" do
context "when there are locations that belong to the selected scheme" do context "when there are locations that belong to the selected scheme" do
let!(:schemes) { FactoryBot.create_list(:scheme, 5) } let!(:schemes) { FactoryBot.create_list(:scheme, 5) }
let(:scheme) { schemes.first } let(:scheme) { schemes.first }
let!(:locations) { FactoryBot.create_list(:location, 3, scheme: scheme) } let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
before do before do
visit("schemes") visit("schemes")

2
spec/requests/schemes_controller_spec.rb
Unescape View File

@ -274,7 +274,7 @@ RSpec.describe SchemesController, type: :request do
context "when signed in as a data coordinator user" do context "when signed in as a data coordinator user" do
let(:user) { FactoryBot.create(:user, :data_coordinator) } let(:user) { FactoryBot.create(:user, :data_coordinator) }
let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) } let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
let!(:location) { FactoryBot.create(:location, scheme: scheme) } let!(:location) { FactoryBot.create(:location, scheme:) }
before do before do
sign_in user sign_in user

Write Preview
Loading…
Cancel
Save