remove: vet tab (#40)

* remove: vet tab * bump: version * fix: linting, remove vet tabs unit tests
DEFRA · Oct 14, 2022 · f5d068e · f5d068e
1 parent f72f792
commit f5d068e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 57 deletions.
diff --git a/app/routes/models/view-application.js b/app/routes/models/view-application.js
@@ -1,13 +1,11 @@
 const getFarmerApplication = require('./farmer-application')
-const getVetVisitData = require('./vet-visit-review')
 const getOrganisationRows = require('./application-organisation')
 const getPaymentData = require('./application-payment')
 const getClaimData = require('./application-claim')
 
 function ViewModel (application) {
   this.model = {
     applicationData: getFarmerApplication(application),
-    vetVisitData: application?.vetVisit ? getVetVisitData(application.vetVisit, application?.data?.whichReview) : false,
     listData: { rows: getOrganisationRows(application?.data?.organisation) },
     paymentData: application?.payment ? getPaymentData(application?.payment) : false,
     claimData: application?.claimed ? getClaimData(application?.updatedAt) : false

diff --git a/app/views/macros/view-application-tabs.njk b/app/views/macros/view-application-tabs.njk
@@ -7,15 +7,6 @@
     {{ govukTable(model.applicationData) }}
   {% endset -%}
 
-  {% set vetReviewHtml %}
-    {% if vetVisit %}
-      <h2 class="govuk-heading-l">Data inputted</h2>
-      {{ govukTable(model.vetVisitData) }}
-    {% else %}
-      <h2 class="govuk-heading-l">Not yet reviewed</h2>
-    {% endif %}
-  {% endset -%}
-
   {% set claimHtml %}
     {% if claimed %}
       <h2 class="govuk-heading-l">Selected for fraud check</h2>
@@ -43,13 +34,6 @@
           html: applicationHtml
         }
       },
-      {
-        label: "Vet Review",
-        id: "vet-review",
-        panel: {
-          html: vetReviewHtml
-        }
-      },
       {
         label: "Claim",
         id: "claim",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffc-ahwr-backoffice",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Back office of the health and welfare of your livestock",
   "homepage": "https://github.com/DEFRA/ffc-ahwr-backoffice",
   "main": "app/index.js",

diff --git a/test/integration/narrow/routes/view-application.test.js b/test/integration/narrow/routes/view-application.test.js
@@ -4,7 +4,6 @@ const applications = require('../../../../app/api/applications')
 const { administrator } = require('../../../../app/auth/permissions')
 const viewApplicationData = require('.././../../data/view-applications.json')
 const reference = 'VV-555A-FD4C'
-const eligibleSpecies = require('../../../../app/constants/eligible-species')
 
 jest.mock('../../../../app/api/applications')
 
@@ -67,7 +66,6 @@ describe('View Application test', () => {
       expect($('tbody tr:nth-child(3) td:nth-child(3)').text()).toContain('At least 21')
       expect($('tbody tr:nth-child(4) td:nth-child(2)').text()).toContain('T&Cs agreed?')
       expect($('tbody tr:nth-child(4) td:nth-child(3)').text()).toContain('Yes')
-      expect($('#vet-review').text()).toContain('Not yet reviewed')
       expect($('#claim').text()).toContain('Not yet able to claim')
       expect($('#payment').text()).toContain('Not yet paid')
       expectPhaseBanner.ok($)
@@ -95,19 +93,6 @@ describe('View Application test', () => {
       expect($('.govuk-summary-list__key').eq(2).text()).toMatch('Email address:')
       expect($('.govuk-summary-list__value').eq(2).text()).toMatch('[email protected]')
 
-      expect($('#vet-review').text()).toContain('Data inputted')
-      expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(2)').text()).toContain('Review date')
-      expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(3)').text()).toContain('06/06/2022')
-      expect($('tbody:nth-child(2) tr:nth-child(2) td:nth-child(2)').text()).toContain(eligibleSpecies.sheep)
-      expect($('tbody:nth-child(2) tr:nth-child(2) td:nth-child(3)').text()).toContain('Yes')
-      expect($('tbody:nth-child(2) tr:nth-child(3) td:nth-child(2)').text()).toContain('Worms in sheep?')
-      expect($('tbody:nth-child(2) tr:nth-child(3) td:nth-child(3)').text()).toContain('Yes')
-      expect($('tbody:nth-child(2) tr:nth-child(4) td:nth-child(2)').text()).toContain('Percentage reduction in EPG?')
-      expect($('tbody:nth-child(2) tr:nth-child(4) td:nth-child(3)').text()).toContain('40')
-      expect($('tbody:nth-child(2) tr:nth-child(5) td:nth-child(2)').text()).toContain('Active chemical used in worming treatment')
-      expect($('tbody:nth-child(2) tr:nth-child(5) td:nth-child(3)').text()).toContain('LV')
-      expect($('tbody:nth-child(2) tr:nth-child(6) td:nth-child(2)').text()).toContain('Report given?')
-      expect($('tbody:nth-child(2) tr:nth-child(6) td:nth-child(3)').text()).toContain('Yes')
       expect($('#claim').text()).toContain('Not yet able to claim')
       expect($('#payment').text()).toContain('Not yet paid')
       expectPhaseBanner.ok($)
@@ -135,15 +120,6 @@ describe('View Application test', () => {
       expect($('.govuk-summary-list__key').eq(2).text()).toMatch('Email address:')
       expect($('.govuk-summary-list__value').eq(2).text()).toMatch('[email protected]')
 
-      expect($('#vet-review').text()).toContain('Data inputted')
-      expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(2)').text()).toContain('Review date')
-      expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(3)').text()).toContain('06/06/2022')
-      expect($('tbody:nth-child(2) tr:nth-child(2) td:nth-child(2)').text()).toContain(eligibleSpecies.pigs)
-      expect($('tbody:nth-child(2) tr:nth-child(2) td:nth-child(3)').text()).toContain('Yes')
-      expect($('tbody:nth-child(2) tr:nth-child(3) td:nth-child(2)').text()).toContain('PRRS in herd?')
-      expect($('tbody:nth-child(2) tr:nth-child(3) td:nth-child(3)').text()).toContain('Yes')
-
-      expect($('#vet-review').text()).toContain('Data inputted')
       expect($('#claim').text()).toContain('Selected for fraud check')
       expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(2)').text()).toContain('Details correct?')
       expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(3)').text()).toContain('Yes')
@@ -173,20 +149,6 @@ describe('View Application test', () => {
       expect($('.govuk-summary-list__key').eq(2).text()).toMatch('Email address:')
       expect($('.govuk-summary-list__value').eq(2).text()).toMatch('[email protected]')
 
-      expect($('#vet-review').text()).toContain('Data inputted')
-      expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(2)').text()).toContain('Review date')
-      expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(3)').text()).toContain('06/06/2022')
-      expect($('tbody:nth-child(2) tr:nth-child(2) td:nth-child(2)').text()).toContain(eligibleSpecies.beef)
-      expect($('tbody:nth-child(2) tr:nth-child(2) td:nth-child(3)').text()).toContain('Yes')
-      expect($('tbody:nth-child(2) tr:nth-child(3) td:nth-child(2)').text()).toContain('BVD in herd?')
-      expect($('tbody:nth-child(2) tr:nth-child(3) td:nth-child(3)').text()).toContain('Yes')
-      expect($('tbody:nth-child(2) tr:nth-child(4) td:nth-child(2)').text()).toContain('Species Vaccinated?')
-      expect($('tbody:nth-child(2) tr:nth-child(4) td:nth-child(3)').text()).toContain('Yes')
-      expect($('tbody:nth-child(2) tr:nth-child(5) td:nth-child(2)').text()).toContain('Last Vaccinated?')
-      expect($('tbody:nth-child(2) tr:nth-child(5) td:nth-child(3)').text()).toContain('6-2008')
-      expect($('tbody:nth-child(2) tr:nth-child(6) td:nth-child(2)').text()).toContain('Vaccination up to date?')
-      expect($('tbody:nth-child(2) tr:nth-child(6) td:nth-child(3)').text()).toContain('No')
-
       expect($('#claim').text()).toContain('Selected for fraud check')
       expect($('#payment').text()).toContain('Payment information')
       expect($('tbody:nth-child(2) tr:nth-child(1) td:nth-child(2)').text()).toContain('G00 - Gross value of claim')