Submit social housing lettings and sales data (CORE)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

53 lines
2.1 KiB

Cldc 1669 add location redesign (#1034) * feat: wip postcode page * feat: wip add new flow * feat: add check answers page, continue updating flow * feat: add back behaviour * feat: more flow work * feat: further flow work and flash notice, name tidying * feat: add check_answers referrer linking * feat: add controller and details linking and lint * refactor: erblinting * feat: add local_authority page (currenlty separate from edit_local_authority to avoid conflict with add location to newly created scheme path, to be fixed later). also copy and routing updates * feat: add validations to controller (could later be added to model) * fix: correct date order * feat: validate on model (except startdate) * feat: copy update * refactor: railsification * feat: add date model validation * feat: add updated availability text in check_answers * feat: more updated dynamic text and linking * refactor: erblinting * refactor: cleanup of redundant code * refactor: remove redundant create * feat: use rails route * test: wip tests * test: wip tests * feat: add new back behaviour for new scheme path and tests wip * feat: add more back behaviour for new scheme path and fix local auth validation * feat: further linking behaviour with routes and referrers, don't add new location automatically to new schemes * feat: if location with no details added, route to normal path rather than check answers * test: update model and helper location tests * test: more test updates * test: more test updates and remove redundant files * test: remove redundant tests, add postcode test * test: add new #new tests * test: add test for all new controller methods * test: add more startdate tests * refactor: erblinting * test: fix failing tests * test: update scheme test * feat: respond to PR comments * feat: make postcode clear only if changed * feat: add _update methods * refactor: simplify validation and location_edit_path method * refactor: add helper method for action text * refactor: remove redundant logic * refactor: simplify routing * refactor: reintroduce location_params * refactor: use presence validation for postcode * refactor: use presence validation for la * feat: validate confirmed * tests: make tests pass with new startdate validation * WIP * refactor: simplify display attributes helpers and update tests * refactor: linting * feat: design change to save behaviour * test: fix failing tests * feat: location code copy tweak * refactor: remove redundant function * refactor: remove add_another_location and new location page * feat: simplify startdate validations to move to model, use scheme available_from date for in range validation * test: fix failing tests * refactor: linting * feat: remove name validation as a result of PO review * test: update tests * refactor: remove redundant context Co-authored-by: James Rose <james@jbpr.net>
2 years ago
<% title = @location.name %>
<% content_for :title, title %>
<% content_for :before_content do %>
<%= govuk_back_link(
href: case params[:route]
when "locations"
scheme_locations_path(@scheme)
else
:back
end,
) %>
<% end %>
<%= render partial: "organisations/headings", locals: { main: "Check your answers", sub: "Add a location to #{@scheme.service_name}" } %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop">
<%= govuk_summary_list do |summary_list| %>
<% display_location_attributes_for_check_answers(@location).each do |attr| %>
<% unless attr[:attribute].eql?("local_authority") && @location.is_la_inferred %>
<%= summary_list.with_row do |row| %>
<% row.with_key { attr[:name] } %>
<% if attr[:attribute].eql?("postcode") && @location.is_la_inferred %>
<% row.with_value do %>
CLDC-3740: Replace you didn't answer text with link to question (#2836) * Different versions of details_html * One version of details_html * Replace you didnt answer with link * Fix lint * Update some tests * Update some tests * Add question marks to yes no questions - test * Improve formatting helper * Improve formatting helper * Improve prompt message * Revert "Add question marks to yes no questions - test" This reverts commit 40bee289 * Rename question method * Add check answer prompt method to question model and translation key * Add translation key to soft validations * Lettings custom prompts * Update to handle new helpdesk ticket logic * Update copy * Update copy * Update method names * Add check answer prompt to soft validations * Change copy * Do not put error objects into cookies * Hide change link for inferred or derived values not yet answered * Revert "Hide change link for inferred or derived values not yet answered" This reverts commit ec1fd1c9aa7db852c0250600ce39335335344f65. * Update lettings related check answer prompts * Update some sales related check answer prompts * Update some sales related check answer prompts * Bug fix * More sales prompts * Replace text for bulk upload * Update uprn known test with specific error message already used * Translation file to CSV * Revert "Translation file to CSV" This reverts commit 0565fea7172ba9fe78af806ee19afdac255a60bc. * Add a red link to show questions that still must be answered (after bulk upload) * Lint * Update feature tests * Update component tests * Update helper tests * Update requests tests * Update request test * Refactor improvements * Refactor improvements 0.2 * Lint * Stay consistent with date question message * Rename variable * Add tests * Improvements * Refactor details table helper * Remove action link not just hide * Revert "Remove action link not just hide" This reverts commit 59ecac5cf3a2c8f1453d7f5ad6c6a1a2ef891578. * Users - remove action link * Organisations - remove action link * Merge requests - remove action link * Revert "Refactor details table helper" This reverts commit b74fd830f13ff0179efeff77421a3d7e43e76d83. * Schemes - remove action link * Location - remove action link * Logs - remove action link * Lint * Refactor V2 details table helper * Allow respond_to? to see private methods * Remove .presence duplication of logic * Change "Answer if" to "Tell us if" * Add missing CAP * Update age questions sales and lettings * Update postcode and la questions * Update wording * Updates and improvements * Another update * Fix bug * typo * typo * update relat to buyer/lead prompts * Update test * Additional copy * Additional copy * Update copy "housing-related" to "housing related" --------- Co-authored-by: Kat <54268893+kosiakkatrina@users.noreply.github.com>
2 weeks ago
<%= details_html(attr, @location) %>
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= formatted_local_authority_timeline(@location) %></span>
<% end %>
<% else %>
CLDC-3740: Replace you didn't answer text with link to question (#2836) * Different versions of details_html * One version of details_html * Replace you didnt answer with link * Fix lint * Update some tests * Update some tests * Add question marks to yes no questions - test * Improve formatting helper * Improve formatting helper * Improve prompt message * Revert "Add question marks to yes no questions - test" This reverts commit 40bee289 * Rename question method * Add check answer prompt method to question model and translation key * Add translation key to soft validations * Lettings custom prompts * Update to handle new helpdesk ticket logic * Update copy * Update copy * Update method names * Add check answer prompt to soft validations * Change copy * Do not put error objects into cookies * Hide change link for inferred or derived values not yet answered * Revert "Hide change link for inferred or derived values not yet answered" This reverts commit ec1fd1c9aa7db852c0250600ce39335335344f65. * Update lettings related check answer prompts * Update some sales related check answer prompts * Update some sales related check answer prompts * Bug fix * More sales prompts * Replace text for bulk upload * Update uprn known test with specific error message already used * Translation file to CSV * Revert "Translation file to CSV" This reverts commit 0565fea7172ba9fe78af806ee19afdac255a60bc. * Add a red link to show questions that still must be answered (after bulk upload) * Lint * Update feature tests * Update component tests * Update helper tests * Update requests tests * Update request test * Refactor improvements * Refactor improvements 0.2 * Lint * Stay consistent with date question message * Rename variable * Add tests * Improvements * Refactor details table helper * Remove action link not just hide * Revert "Remove action link not just hide" This reverts commit 59ecac5cf3a2c8f1453d7f5ad6c6a1a2ef891578. * Users - remove action link * Organisations - remove action link * Merge requests - remove action link * Revert "Refactor details table helper" This reverts commit b74fd830f13ff0179efeff77421a3d7e43e76d83. * Schemes - remove action link * Location - remove action link * Logs - remove action link * Lint * Refactor V2 details table helper * Allow respond_to? to see private methods * Remove .presence duplication of logic * Change "Answer if" to "Tell us if" * Add missing CAP * Update age questions sales and lettings * Update postcode and la questions * Update wording * Updates and improvements * Another update * Fix bug * typo * typo * update relat to buyer/lead prompts * Update test * Additional copy * Additional copy * Update copy "housing-related" to "housing related" --------- Co-authored-by: Kat <54268893+kosiakkatrina@users.noreply.github.com>
2 weeks ago
<% row.with_value { details_html(attr, @location) if user_can_edit_scheme?(current_user, @scheme) } %>
<% end %>
CLDC-3740: Replace you didn't answer text with link to question (#2836) * Different versions of details_html * One version of details_html * Replace you didnt answer with link * Fix lint * Update some tests * Update some tests * Add question marks to yes no questions - test * Improve formatting helper * Improve formatting helper * Improve prompt message * Revert "Add question marks to yes no questions - test" This reverts commit 40bee289 * Rename question method * Add check answer prompt method to question model and translation key * Add translation key to soft validations * Lettings custom prompts * Update to handle new helpdesk ticket logic * Update copy * Update copy * Update method names * Add check answer prompt to soft validations * Change copy * Do not put error objects into cookies * Hide change link for inferred or derived values not yet answered * Revert "Hide change link for inferred or derived values not yet answered" This reverts commit ec1fd1c9aa7db852c0250600ce39335335344f65. * Update lettings related check answer prompts * Update some sales related check answer prompts * Update some sales related check answer prompts * Bug fix * More sales prompts * Replace text for bulk upload * Update uprn known test with specific error message already used * Translation file to CSV * Revert "Translation file to CSV" This reverts commit 0565fea7172ba9fe78af806ee19afdac255a60bc. * Add a red link to show questions that still must be answered (after bulk upload) * Lint * Update feature tests * Update component tests * Update helper tests * Update requests tests * Update request test * Refactor improvements * Refactor improvements 0.2 * Lint * Stay consistent with date question message * Rename variable * Add tests * Improvements * Refactor details table helper * Remove action link not just hide * Revert "Remove action link not just hide" This reverts commit 59ecac5cf3a2c8f1453d7f5ad6c6a1a2ef891578. * Users - remove action link * Organisations - remove action link * Merge requests - remove action link * Revert "Refactor details table helper" This reverts commit b74fd830f13ff0179efeff77421a3d7e43e76d83. * Schemes - remove action link * Location - remove action link * Logs - remove action link * Lint * Refactor V2 details table helper * Allow respond_to? to see private methods * Remove .presence duplication of logic * Change "Answer if" to "Tell us if" * Add missing CAP * Update age questions sales and lettings * Update postcode and la questions * Update wording * Updates and improvements * Another update * Fix bug * typo * typo * update relat to buyer/lead prompts * Update test * Additional copy * Additional copy * Update copy "housing-related" to "housing related" --------- Co-authored-by: Kat <54268893+kosiakkatrina@users.noreply.github.com>
2 weeks ago
<% if LocationPolicy.new(current_user, @location).update? && attr[:value] %>
<% row.with_action(text: location_action_text(attr, @location), href: location_edit_path(@location, attr[:attribute])) %>
<% else %>
<% row.with_action %>
<% end %>
<% end %>
Cldc 1669 add location redesign (#1034) * feat: wip postcode page * feat: wip add new flow * feat: add check answers page, continue updating flow * feat: add back behaviour * feat: more flow work * feat: further flow work and flash notice, name tidying * feat: add check_answers referrer linking * feat: add controller and details linking and lint * refactor: erblinting * feat: add local_authority page (currenlty separate from edit_local_authority to avoid conflict with add location to newly created scheme path, to be fixed later). also copy and routing updates * feat: add validations to controller (could later be added to model) * fix: correct date order * feat: validate on model (except startdate) * feat: copy update * refactor: railsification * feat: add date model validation * feat: add updated availability text in check_answers * feat: more updated dynamic text and linking * refactor: erblinting * refactor: cleanup of redundant code * refactor: remove redundant create * feat: use rails route * test: wip tests * test: wip tests * feat: add new back behaviour for new scheme path and tests wip * feat: add more back behaviour for new scheme path and fix local auth validation * feat: further linking behaviour with routes and referrers, don't add new location automatically to new schemes * feat: if location with no details added, route to normal path rather than check answers * test: update model and helper location tests * test: more test updates * test: more test updates and remove redundant files * test: remove redundant tests, add postcode test * test: add new #new tests * test: add test for all new controller methods * test: add more startdate tests * refactor: erblinting * test: fix failing tests * test: update scheme test * feat: respond to PR comments * feat: make postcode clear only if changed * feat: add _update methods * refactor: simplify validation and location_edit_path method * refactor: add helper method for action text * refactor: remove redundant logic * refactor: simplify routing * refactor: reintroduce location_params * refactor: use presence validation for postcode * refactor: use presence validation for la * feat: validate confirmed * tests: make tests pass with new startdate validation * WIP * refactor: simplify display attributes helpers and update tests * refactor: linting * feat: design change to save behaviour * test: fix failing tests * feat: location code copy tweak * refactor: remove redundant function * refactor: remove add_another_location and new location page * feat: simplify startdate validations to move to model, use scheme available_from date for in range validation * test: fix failing tests * refactor: linting * feat: remove name validation as a result of PO review * test: update tests * refactor: remove redundant context Co-authored-by: James Rose <james@jbpr.net>
2 years ago
<% end %>
<% end %>
<% end %>
</div>
Cldc 1669 add location redesign (#1034) * feat: wip postcode page * feat: wip add new flow * feat: add check answers page, continue updating flow * feat: add back behaviour * feat: more flow work * feat: further flow work and flash notice, name tidying * feat: add check_answers referrer linking * feat: add controller and details linking and lint * refactor: erblinting * feat: add local_authority page (currenlty separate from edit_local_authority to avoid conflict with add location to newly created scheme path, to be fixed later). also copy and routing updates * feat: add validations to controller (could later be added to model) * fix: correct date order * feat: validate on model (except startdate) * feat: copy update * refactor: railsification * feat: add date model validation * feat: add updated availability text in check_answers * feat: more updated dynamic text and linking * refactor: erblinting * refactor: cleanup of redundant code * refactor: remove redundant create * feat: use rails route * test: wip tests * test: wip tests * feat: add new back behaviour for new scheme path and tests wip * feat: add more back behaviour for new scheme path and fix local auth validation * feat: further linking behaviour with routes and referrers, don't add new location automatically to new schemes * feat: if location with no details added, route to normal path rather than check answers * test: update model and helper location tests * test: more test updates * test: more test updates and remove redundant files * test: remove redundant tests, add postcode test * test: add new #new tests * test: add test for all new controller methods * test: add more startdate tests * refactor: erblinting * test: fix failing tests * test: update scheme test * feat: respond to PR comments * feat: make postcode clear only if changed * feat: add _update methods * refactor: simplify validation and location_edit_path method * refactor: add helper method for action text * refactor: remove redundant logic * refactor: simplify routing * refactor: reintroduce location_params * refactor: use presence validation for postcode * refactor: use presence validation for la * feat: validate confirmed * tests: make tests pass with new startdate validation * WIP * refactor: simplify display attributes helpers and update tests * refactor: linting * feat: design change to save behaviour * test: fix failing tests * feat: location code copy tweak * refactor: remove redundant function * refactor: remove add_another_location and new location page * feat: simplify startdate validations to move to model, use scheme available_from date for in range validation * test: fix failing tests * refactor: linting * feat: remove name validation as a result of PO review * test: update tests * refactor: remove redundant context Co-authored-by: James Rose <james@jbpr.net>
2 years ago
</div>
<% if LocationPolicy.new(current_user, @location).create? %>
<div class="govuk-button-group">
<%= govuk_button_to "Save and return to locations", scheme_location_confirm_path(@scheme, @location, route: params[:route]), method: :patch %>
<% if LocationPolicy.new(current_user, @location).delete? %>
<%= delete_location_link(@location) %>
<% end %>
<%= govuk_button_link_to "Cancel", scheme_locations_path(@scheme), secondary: true %>
</div>
<% end %>