Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FCRM-4458 Altered confirm-location to be in line with the prototype #377

Merged
merged 3 commits into from
Oct 26, 2023
Merged

FCRM-4458 Altered confirm-location to be in line with the prototype #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6779b90
Set Version to 2.7.0-pre.1
markfee Oct 25, 2023
7f41e6e
FCRM-4458 Altered confirm-location to be in line with the prototype
markfee Oct 26, 2023
645e965
Set Version to 2.7.0-pre.2
markfee Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fmfp",
"version": "2.6.0",
"version": "2.7.0-pre.2",
"dataVersion": "2.5.1",
"description": "Flood map for planning",
"main": "index.js",
Expand Down
1 change: 0 additions & 1 deletion server/routes/confirm-location.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ module.exports = [{
let { locationDetails = '' } = request.query
if (locationDetails) {
locationDetails = locationDetails
.replace(/, England$/, '')
.replace((new RegExp(`^${placeOrPostcode}, `, 'i')), '')
}
const model = new ConfirmLocationViewModel(
Expand Down
38 changes: 17 additions & 21 deletions server/views/confirm-location.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
<div id="confirm-location-page" class="govuk-grid-row">

<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">Draw the boundary of your site</h1>
<h1 class="govuk-heading-xl">
Draw the boundary of your site
</h1>
</div>

<div class="govuk-grid-column-two-thirds">
<div class="hide" data-journey="{{analyticsPageEvent}}"></div>
{% if locationDetails %}
<p class="govuk-body">Your search for '{{placeOrPostcodeUnencoded}}' has been placed in {{locationDetails}}.</p>
Expand All @@ -32,7 +37,7 @@ <h1 class="govuk-heading-xl">Draw the boundary of your site</h1>

<p class="govuk-body">You need to draw the boundary of your site on the map below so we can give you accurate flood risk information.</p>

<details class="govuk-details" data-module="govuk-details" data-journey-click="Confirm-Location:DETAIL-CLICK:How-to-draw-Boundary">
<details class="govuk-details govuk-!-margin-top-4" data-module="govuk-details" data-journey-click="Confirm-Location:DETAIL-CLICK:How-to-draw-Boundary">
<summary class="govuk-details__summary">
<span class="govuk-details__summary-text">
How to draw a boundary
Expand All @@ -48,11 +53,11 @@ <h1 class="govuk-heading-xl">Draw the boundary of your site</h1>
<p class="govuk-body">
If you need to change the finished boundary you can:
</p>
<ol class="govuk-list govuk-list--bullet">
<ul class="govuk-list govuk-list--bullet">
<li> click and drag the points to adjust them </li>
<li> add more points by clicking or tapping on a line </li>
<li> delete the boundary you've drawn and start again by clicking or tapping the 'Delete boundary' button </li>
</ol>
</ul>
<p class="govuk-body">
Click or tap the Continue button to get your flood risk information.
</p>
Expand Down Expand Up @@ -100,27 +105,18 @@ <h1 class="govuk-heading-xl">Draw the boundary of your site</h1>
</figure>
</div>

<div class="govuk-grid-column-full">
<a href="/flood-zone-results?easting={{easting}}&amp;northing={{northing}}&amp;location={{location}}" role="button" draggable="false" class="govuk-button govuk-!-margin-top-7 govuk-!-margin-bottom-8 govuk-button--start" data-module="govuk-button">
<div class="govuk-grid-column-two-thirds">
<a id="continue-button" href="/flood-zone-results?easting={{easting}}&amp;northing={{northing}}&amp;location={{location}}" role="button" draggable="false" class="govuk-button govuk-!-margin-top-7 govuk-!-margin-bottom-8 govuk-button--start" data-module="govuk-button">
Continue
</a>
<h2 class="govuk-heading-m">If you need help drawing a boundary</h2>
<p class="govuk-body" data-pso-contact-email>Contact the Environment Agency team in {{areaName}} at <a href="mailto:{{psoEmailAddress}}">{{psoEmailAddress}}</a></p>
<p class="govuk-body" data-pso-contact-email>Contact the Environment Agency team in {{areaName}} at <a href="mailto:{{psoEmailAddress}}" class="govuk-link">{{psoEmailAddress}}</a>.</p>
<p class="govuk-body">Or contact the Environment Agency:</p>
<ul class="govuk-list">
<li>
<span>Environment Agency</span>
</li>
<li>
<span>Telephone: 03708 506 506</span>
</li>
<li>
<span>Monday to Friday, 8am to 6pm</span>
</li>
<li>
<a href="https://www.gov.uk/call-charges">Find out about call charges</a>
</li>
</ul>
<p class="govuk-body">Environment Agency<br>
Telephone: 03708 506 506 <br>
Monday to Friday, 8am to 6pm <br>
<a href="https://www.gov.uk/call-charges">Find out about call charges</a>
</p>
</div>
</div>

Expand Down
Loading