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

Amend no returns message in view licence Returns tab #1087

Merged

Conversation

jonathangoulding
Copy link
Collaborator

@jonathangoulding jonathangoulding commented Jun 11, 2024

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

A licence can be linked to both return versions and return submissions. However, currently, the two are not generated at the same time. Plus, it is valid that a licence has neither.

We want to make the messaging more informative so this change amends the message we show when there are no returns.

  • If a licence has neither - No requirements for returns have been set up for this licence.
  • If a licence has return versions but no submissions - No returns for this licence.
  • If a licence has both - (show the table of return submissions)

When a licence has returns show the returns table.

When the licence does not have returns and or requirements then the messages show need to show different messages.
@jonathangoulding jonathangoulding added the enhancement New feature or request label Jun 11, 2024
@jonathangoulding jonathangoulding self-assigned this Jun 11, 2024
@jonathangoulding jonathangoulding marked this pull request as ready for review June 11, 2024 15:12
@Cruikshanks Cruikshanks changed the title View Licence Returns no return messages Amend no returns message in view licence Returns tab Jun 12, 2024
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.

I'm going to stop here as I've suggested some things that might impact a number of the tests.

Let me know if you need to catch me about any of this.

app/views/licences/tabs/returns.njk Outdated Show resolved Hide resolved
test/controllers/licences.controller.test.js Show resolved Hide resolved
@jonathangoulding jonathangoulding marked this pull request as draft June 12, 2024 08:56
@jonathangoulding jonathangoulding marked this pull request as ready for review June 12, 2024 11:14
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.

@jonathangoulding jonathangoulding merged commit 3f05d48 into main Jun 13, 2024
6 checks passed
@jonathangoulding jonathangoulding deleted the feature-licence-returns-summary-no-returns-message branch June 13, 2024 09:10
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.

2 participants