diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb
new file mode 100644
index 000000000..568a2fa60
--- /dev/null
+++ b/app/controllers/locations_controller.rb
@@ -0,0 +1,67 @@
+class LocationsController < ApplicationController
+ include Pagy::Backend
+ before_action :authenticate_user!
+ before_action :authenticate_scope!
+ before_action :find_location, except: %i[new create index]
+ before_action :find_scheme
+ before_action :authenticate_action!
+
+ def index
+ @pagy, @locations = pagy(@scheme.locations)
+ @total_count = @scheme.locations.size
+ end
+
+ def new
+ @location = Location.new
+ end
+
+ def create
+ @location = Location.new(location_params)
+
+ if @location.save
+ location_params[:add_another_location] == "Yes" ? redirect_to(new_location_path(id: @scheme.id)) : redirect_to(scheme_check_answers_path(scheme_id: @scheme.id))
+ else
+ render :new, status: :unprocessable_entity
+ end
+ end
+
+ def edit; end
+
+ def update
+ if @location.update(location_params)
+ location_params[:add_another_location] == "Yes" ? redirect_to(new_location_path(@location.scheme)) : redirect_to(scheme_check_answers_path(@scheme, anchor: "locations"))
+ else
+ render :edit, status: :unprocessable_entity
+ end
+ end
+
+private
+
+ def find_scheme
+ @scheme = if %w[new create index].include?(action_name)
+ Scheme.find(params[:id])
+ else
+ @location.scheme
+ end
+ end
+
+ def find_location
+ @location = Location.find(params[:id])
+ end
+
+ def authenticate_scope!
+ head :unauthorized and return unless current_user.data_coordinator? || current_user.support?
+ end
+
+ def authenticate_action!
+ if %w[new edit update create index].include?(action_name) && !((current_user.organisation == @scheme.organisation) || current_user.support?)
+ render_not_found and return
+ end
+ end
+
+ def location_params
+ required_params = params.require(:location).permit(:postcode, :name, :total_units, :type_of_unit, :wheelchair_adaptation, :add_another_location).merge(scheme_id: @scheme.id)
+ required_params[:postcode] = required_params[:postcode].delete(" ").upcase.encode("ASCII", "UTF-8", invalid: :replace, undef: :replace, replace: "") if required_params[:postcode]
+ required_params
+ end
+end
diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb
index 4dd657534..c6e18db29 100644
--- a/app/controllers/schemes_controller.rb
+++ b/app/controllers/schemes_controller.rb
@@ -20,12 +20,6 @@ class SchemesController < ApplicationController
@scheme = Scheme.find_by(id: params[:id])
end
- def locations
- @scheme = Scheme.find_by(id: params[:id])
- @pagy, @locations = pagy(@scheme.locations)
- @total_count = @scheme.locations.size
- end
-
def new
@scheme = Scheme.new
end
@@ -100,7 +94,7 @@ private
when "secondary-client-group"
scheme_support_path(@scheme)
when "support"
- scheme_check_answers_path(@scheme)
+ new_location_path
when "details"
scheme_primary_client_group_path(@scheme)
end
@@ -113,7 +107,6 @@ private
:stock_owning_organisation_id,
:scheme_type,
:registered_under_care_act,
- :total_units,
:id,
:has_other_client_group,
:primary_client_group,
diff --git a/app/helpers/tab_nav_helper.rb b/app/helpers/tab_nav_helper.rb
index f316d5ab2..3ef211401 100644
--- a/app/helpers/tab_nav_helper.rb
+++ b/app/helpers/tab_nav_helper.rb
@@ -6,6 +6,11 @@ module TabNavHelper
[govuk_link_to(link_text, user), "User #{user.email}"].join("\n")
end
+ def location_cell(location)
+ link_text = location.postcode
+ [govuk_link_to(link_text, "/schemes/#{location.scheme.id}/locations/#{location.id}/edit", method: :patch), "Location #{location.name}"].join("\n")
+ end
+
def scheme_cell(scheme)
link_text = scheme.service_name
[govuk_link_to(link_text, scheme), "Scheme #{scheme.primary_client_group}"].join("\n")
diff --git a/app/models/location.rb b/app/models/location.rb
index d3cc23f82..c8be513eb 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -1,13 +1,28 @@
class Location < ApplicationRecord
+ include Validations::PropertyValidations
+ validate :validate_postcode
belongs_to :scheme
+ attr_accessor :add_another_location
+
WHEELCHAIR_ADAPTATIONS = {
- No: 0,
Yes: 1,
+ No: 0,
}.freeze
enum wheelchair_adaptation: WHEELCHAIR_ADAPTATIONS
+ TYPE_OF_UNIT = {
+ "Self-contained flat or bedsit": 1,
+ "Self-contained flat or bedsit with common facilities": 2,
+ "Shared flat": 3,
+ "Shared house or hostel": 4,
+ "Bungalow": 5,
+ "Self-contained house": 6,
+ }.freeze
+
+ enum type_of_unit: TYPE_OF_UNIT
+
def display_attributes
[
{ name: "Location code ", value: location_code, suffix: false },
@@ -17,4 +32,13 @@ class Location < ApplicationRecord
{ name: "Wheelchair adaptation", value: wheelchair_adaptation, suffix: false },
]
end
+
+private
+
+ def validate_postcode
+ if postcode.nil? || !postcode&.match(Validations::PropertyValidations::POSTCODE_REGEXP)
+ error_message = I18n.t("validations.postcode")
+ errors.add :postcode, error_message
+ end
+ end
end
diff --git a/app/views/locations/edit.html.erb b/app/views/locations/edit.html.erb
new file mode 100644
index 000000000..bbcccdef6
--- /dev/null
+++ b/app/views/locations/edit.html.erb
@@ -0,0 +1,63 @@
+<% content_for :title, "Add a location to this scheme" %>
+
+<% content_for :before_content do %>
+ <%= govuk_back_link(
+ text: "Back",
+ href: "/schemes/#{@scheme.id}/support",
+ ) %>
+<% end %>
+
+<%= render partial: "organisations/headings", locals: { main: "Add a location to this scheme", sub: @scheme.service_name } %>
+
+<%= form_for(@location, method: :patch, url: location_path) do |f| %>
+
+
+ <%= f.govuk_error_summary %>
+
+ <%= f.govuk_text_field :postcode,
+ label: { size: "m" },
+ hint: { text: "For example, SW1P 4DF." },
+ width: 5 %>
+
+ <%= f.govuk_text_field :name,
+ label: { text: "Name (optional)", size: "m" },
+ hint: { text: "This is how you refer to this location within your organisation" } %>
+
+ <%= f.govuk_number_field :total_units,
+ label: { text: "Total number of units at this location", size: "m" },
+ width: 2,
+ hint: { text: "A unit can be a bedroom in a shared house or flat, or a house with 4 bedrooms. Do not include bedrooms used for wardens, managers, volunteers or sleep-in staff.s" },
+ autofocus: true %>
+
+ <% type_of_units_selection = Location.type_of_units.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+
+ <%= f.govuk_collection_radio_buttons :type_of_unit,
+ type_of_units_selection,
+ :id,
+ :name,
+ legend: { text: "What is this type of scheme?", size: "m" } %>
+
+ <% wheelchair_user_selection = Location.wheelchair_adaptations.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+
+ <%= f.govuk_collection_radio_buttons :wheelchair_adaptation,
+ wheelchair_user_selection,
+ :id,
+ :name,
+ hint: { text: "This includes stairlifts, ramps, level-access showers or grab rails" },
+ legend: { text: "Are the majority of units in this location built or adapted to wheelchair-user standards?", size: "m" } %>
+
+ <%= govuk_section_break(visible: true, size: "m") %>
+
+ <% another_location_selection = %w[Yes no].map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+
+ <%= f.govuk_collection_radio_buttons :add_another_location,
+ another_location_selection,
+ :id,
+ :name,
+ inline: true,
+ legend: { text: "Do you want to add another location?", size: "m" } %>
+
+ <%= f.govuk_submit "Save and continue" %>
+
+
+
+ <%= govuk_table do |table| %>
+ <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
+ <%= @scheme.locations.count %> <%= @scheme.locations.count.eql?(1) ? "location" : "locations" %>.
+ <% end %>
+ <%= table.head do |head| %>
+ <%= head.row do |row| %>
+ <% row.cell(header: true, text: "Code", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Postcode", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Units", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Common unit type", html_attributes: {
+ scope: "col",
+ }) %>
+ <% end %>
+ <% end %>
+ <% @locations.each do |location| %>
+ <%= table.body do |body| %>
+ <%= body.row do |row| %>
+ <% row.cell(text: location.id) %>
+ <% row.cell(text: location.postcode) %>
+ <% row.cell(text: location.total_units) %>
+ <% row.cell(text: simple_format("#{location.type_of_unit}#{location.wheelchair_adaptation == 'Yes' ? "\nWith wheelchair adaptations" : ''}")) %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+
+
+
+ <%= f.govuk_error_summary %>
+
+ <%= f.govuk_text_field :postcode,
+ label: { size: "m" },
+ hint: { text: "For example, SW1P 4DF." },
+ width: 5 %>
+
+ <%= f.govuk_text_field :name,
+ label: { text: "Name (optional)", size: "m" },
+ hint: { text: "This is how you refer to this location within your organisation" } %>
+
+ <%= f.govuk_number_field :total_units,
+ label: { text: "Total number of units at this location", size: "m" },
+ width: 2,
+ hint: { text: "A unit can be a bedroom in a shared house or flat, or a house with 4 bedrooms. Do not include bedrooms used for wardens, managers, volunteers or sleep-in staff.s" },
+ autofocus: true %>
+
+ <% type_of_units_selection = Location.type_of_units.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+
+ <%= f.govuk_collection_radio_buttons :type_of_unit,
+ type_of_units_selection,
+ :id,
+ :name,
+ legend: { text: "What is this type of scheme?", size: "m" } %>
+
+ <% wheelchair_user_selection = Location.wheelchair_adaptations.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+
+ <%= f.govuk_collection_radio_buttons :wheelchair_adaptation,
+ wheelchair_user_selection,
+ :id,
+ :name,
+ hint: { text: "This includes stairlifts, ramps, level-access showers or grab rails" },
+ legend: { text: "Are the majority of units in this location built or adapted to wheelchair-user standards?", size: "m" } %>
+
+ <%= govuk_section_break(visible: true, size: "m") %>
+
+ <% another_location_selection = %w[Yes No].map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+
+ <%= f.govuk_collection_radio_buttons :add_another_location,
+ another_location_selection,
+ :id,
+ :name,
+ inline: true,
+ legend: { text: "Do you want to add another location?", size: "m" } %>
+
+ <%= f.govuk_submit "Save and continue" %>
+
+
+
+ <%= govuk_tabs(title: "Check your answers before creating this scheme") do |component| %>
+ <% component.tab(label: "Scheme") do %>
+ <%= govuk_summary_list do |summary_list| %>
+ <% @scheme.check_details_attributes.each do |attr| %>
+ <% next if current_user.data_coordinator? && attr[:name] == ("Managed by") %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].to_s } %>
+ <% row.value { details_html(attr) } %>
+ <% row.action(
+ text: "Change",
+ href: scheme_details_path(scheme_id: @scheme.id, check_answers: true),
+ ) %>
+ <% end %>
+ <% end %>
+ <% @scheme.check_primary_client_attributes.each do |attr| %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].to_s } %>
+ <% row.value { details_html(attr) } %>
+ <% row.action(
+ text: "Change",
+ href: scheme_primary_client_group_path(scheme_id: @scheme.id, check_answers: true),
+ ) %>
+ <% end %>
+ <% end %>
+ <% @scheme.check_secondary_client_confirmation_attributes.each do |attr| %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].to_s } %>
+ <% row.value { details_html(attr) } %>
+ <% row.action(
+ text: "Change",
+ href: scheme_confirm_secondary_client_group_path(scheme_id: @scheme.id, check_answers: true),
+ ) %>
+ <% end %>
+ <% end %>
+ <% if @scheme.has_other_client_group == "Yes" %>
+ <% @scheme.check_secondary_client_attributes.each do |attr| %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].to_s } %>
+ <% row.value { details_html(attr) } %>
+ <% row.action(
+ text: "Change",
+ href: scheme_secondary_client_group_path(scheme_id: @scheme.id, check_answers: true),
+ ) %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% @scheme.check_support_attributes.each do |attr| %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].to_s } %>
+ <% row.value { details_html(attr) } %>
+ <% row.action(
+ text: "Change",
+ href: scheme_support_path(scheme_id: @scheme.id, check_answers: true),
+ ) %>
+ <% end %>
<% end %>
<% end %>
<% end %>
- <% @scheme.check_support_attributes.each do |attr| %>
- <%= summary_list.row do |row| %>
- <% row.key { attr[:name].to_s } %>
- <% row.value { details_html(attr) } %>
- <% row.action(
- text: "Change",
- href: scheme_support_path(scheme_id: @scheme.id, check_answers: true),
- ) %>
+ <% component.tab(label: "Locations") do %>
+ <%= govuk_table do |table| %>
+ <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
+ <%= @scheme.locations.count %> <%= @scheme.locations.count.eql?(1) ? "location" : "locations" %>
+ <% end %>
+ <%= table.head do |head| %>
+ <%= head.row do |row| %>
+ <% row.cell(header: true, text: "Code", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Postcode", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Units", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Common unit type", html_attributes: {
+ scope: "col",
+ }) %>
+ <% end %>
+ <% end %>
+ <% @scheme.locations.each do |location| %>
+ <%= table.body do |body| %>
+ <%= body.row do |row| %>
+ <% row.cell(text: location.id) %>
+ <% row.cell(text: simple_format(location_cell(location), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
+ <% row.cell(text: location.total_units) %>
+ <% row.cell(text: simple_format("#{location.type_of_unit}#{location.wheelchair_adaptation == 'Yes' ? "\nWith wheelchair adaptations" : ''}")) %>
+ <% end %>
+ <% end %>
+ <% end %>
<% end %>
+ <%= govuk_button_link_to "Add a location", new_location_path(id: @scheme.id), secondary: true %>
<% end %>
<% end %>
- <% end %>
-<% end %>
+
+
-
- <% @locations.each do |location| %>
-
-
-
-
- <% location.display_attributes.each do |attribute| %>
-
-
-
- <%= attribute[:name] %>
-
- -
- <%= attribute[:value] %>
- <% if attribute[:suffix] %>
- <%= attribute[:suffix] %>
- <% end %>
-
-
- <% end %>
-
-
- <% end %>
-
-