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.

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

Add requirements approved page (return requirements) #580

Merged
merged 3 commits into from
Dec 12, 2023
Merged

Conversation

Demwunz
Copy link
Contributor

@Demwunz Demwunz commented Dec 12, 2023

https://eaflood.atlassian.net/browse/WATER-4251

This change adds a returns approved confirmation page to the end of the "no return requirements" journey.

This is the last page in the journey.

This is just a stub page.

@Demwunz Demwunz added the enhancement New feature or request label Dec 12, 2023
@Demwunz Demwunz self-assigned this Dec 12, 2023
@Demwunz Demwunz force-pushed the WATER-4251 branch 3 times, most recently from 3fce15d to 8008847 Compare December 12, 2023 15:22
@Demwunz Demwunz marked this pull request as ready for review December 12, 2023 15:23
Copy link
Member

@Cruikshanks Cruikshanks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some minor tweaks that come from working with a new team and codebase (and a tidy-freak of a tech lead 😬 🧹 )

Comment on lines 37 to 38
selectReturnStartDate,
requirementsApproved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To help those who get anxious about this kind of thing and to avoid the rest of us having to expend any effort we try and have some guidance on how to order things.

We have one for the top of JS files, and when I find the time I'll write up ones for functions and require() ordering.

The long and short of it is that we go alphabetically.

Suggested change
selectReturnStartDate,
requirementsApproved
requirementsApproved,
selectReturnStartDate

So, just a minor tweak. 😁

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no problem, updated

<h2 class="govuk-heading-m">What happens next</h2>
<p class="govuk-body">These return requirements are now active and returns will be opened for this licence in the next returns cycle.</p>
<p class="govuk-body"><a href="{{rootLink}}" class="govuk-link">Return to licence set up</a></p>
{% endblock %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If only to avoid this scary-looking glyph, we ensure all files end with a newline.

Screenshot 2023-12-12 at 16 41 24

If it helps there is a setting you can enable in VSCode to ensure this always happens when you save a file, "files.insertFinalNewline": true,. We have a few suggested VSCode settings folks might want to enable. Check out any of the *.settings.json files in docs/vscode to see them. You can also run 🌈 Settings in wal-dev-environment to have these settings applied to all the repos.

Suggested change
{% endblock %}
{% endblock %}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I normally have this set to true or get eslint to catch in pre-commit hooks.

Added in new line :)

@@ -71,4 +71,23 @@ describe('Licences controller', () => {
})
})
})
describe('GET /licences/{id}/requirements-approved', () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to break up the tests, we use a bit of whitespace to separate them.

Suggested change
describe('GET /licences/{id}/requirements-approved', () => {
describe('GET /licences/{id}/requirements-approved', () => {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Demwunz and others added 3 commits December 12, 2023 17:27
https://eaflood.atlassian.net/browse/WATER-4251

This change adds a returns approved confirmation page to the end of the "no return requirements" journey.

This is the last page in the journey.

This is just a stub page.
@Demwunz Demwunz merged commit e9e3344 into main Dec 12, 2023
6 checks passed
@Demwunz Demwunz deleted the WATER-4251 branch December 12, 2023 17:34
Beckyrose200 pushed a commit that referenced this pull request Dec 14, 2023
https://eaflood.atlassian.net/browse/WATER-4251

This change adds a returns approved confirmation page to the end of the "no return requirements" journey.

This is the last page in the journey.

This is just a stub page.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants