Skip to content

Commit 17390f6

Browse files
feat: add in check tab data (#53)
* feat: add in check tab data * bump: version
1 parent 070746f commit 17390f6

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

app/routes/models/view-application.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ const getFarmerApplication = require('./farmer-application')
22
const getOrganisationRows = require('./application-organisation')
33
const getClaimData = require('./application-claim')
44

5+
const claimDataStatus = ['IN CHECK', 'REJECTED', 'READY TO PAY']
6+
57
function ViewModel (application) {
68
this.model = {
79
applicationData: getFarmerApplication(application),
810
listData: { rows: getOrganisationRows(application?.data?.organisation) },
9-
claimData: application?.claimed ? getClaimData(application) : false
11+
claimData: application?.claimed || claimDataStatus.includes(application?.status?.status) ? getClaimData(application) : false
1012
}
1113
}
1214

app/views/macros/view-application-tabs.njk

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
{% if claimed %}
1212
<h2 class="govuk-heading-l">Claimed</h2>
1313
{{ govukTable(model.claimData) }}
14+
{% elif (status == "In check") %}
15+
<h2 class="govuk-heading-l">Not claimed yet</h2>
16+
{{ govukTable(model.claimData) }}
17+
{% elif (status == "Rejected") %}
18+
<h2 class="govuk-heading-l">Not eligible to claim</h2>
19+
{{ govukTable(model.claimData) }}
1420
{% elif (status == "Agreed") %}
1521
<h2 class="govuk-heading-l">Not claimed yet</h2>
1622
{% else %}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ffc-ahwr-backoffice",
3-
"version": "1.14.5",
3+
"version": "1.14.6",
44
"description": "Back office of the health and welfare of your livestock",
55
"homepage": "https://github.com/DEFRA/ffc-ahwr-backoffice",
66
"main": "app/index.js",

0 commit comments

Comments
 (0)