Merge pull request #621 from companieshouse/lp-1464-extract-common-fields

LP 1464: Extracted names into full-name.njk fragment

Author: jdowie-ch

src/views/add-general-partner-person.njk

@@ -54,37 +54,8 @@
 
         <h1 class="govuk-heading-xl">{{ i18n.addPartnerPersonPage.generalPartner.title }}</h1>
 
-        {{ govukInput({
-          label: {
-            text: i18n.addPartnerPersonPage.firstName,
-            classes: "govuk-label govuk-label--m",
-            isPageHeading: false
-          },
-          id: "forename",
-          name: "forename",
-          value: props.data.generalPartner.data.forename,
-          classes: "govuk-!-width-full",
-          errorMessage: props.errors.forename if props.errors,
-          attributes : {
-            required: true
-          }
-        }) }}
-
-        {{ govukInput({
-          label: {
-            text: i18n.addPartnerPersonPage.lastName,
-            classes: "govuk-label govuk-label--m",
-            isPageHeading: false
-          },
-          id: "surname",
-          name: "surname",
-          value: props.data.generalPartner.data.surname,
-          classes: "govuk-!-width-full",
-          errorMessage: props.errors.surname if props.errors,
-          attributes : {
-            required : true
-          }
-        }) }}
+        {% set partner = "generalPartner" %}
+        {% include "pages/partner/full-name.njk" %}
 
         {% set previousHtmlPerson %}
           {{ govukInput({

src/views/add-limited-partner-person.njk

@@ -56,37 +56,8 @@
 
         <h1 class="govuk-heading-xl">{{ i18n.addPartnerPersonPage.limitedPartner.title }}</h1>
 
-        {{ govukInput({
-          label: {
-            text: i18n.addPartnerPersonPage.firstName,
-            classes: "govuk-label govuk-label--m",
-            isPageHeading: false
-          },
-          id: "forename",
-          name: "forename",
-          value: props.data.limitedPartner.data.forename,
-          classes: "govuk-!-width-full",
-          errorMessage: props.errors.forename if props.errors,
-          attributes : {
-            required: true
-          }
-        }) }}
-
-        {{ govukInput({
-          label: {
-            text: i18n.addPartnerPersonPage.lastName,
-            classes: "govuk-label govuk-label--m",
-            isPageHeading: false
-          },
-          id: "surname",
-          name: "surname",
-          value: props.data.limitedPartner.data.surname,
-          classes: "govuk-!-width-full",
-          errorMessage: props.errors.surname if props.errors,
-          attributes : {
-            required : true
-          }
-        }) }}
+        {% set partner = "limitedPartner" %}
+        {% include "pages/partner/full-name.njk" %}
 
         {% set previousHtmlPerson %}
           {{ govukInput({

src/views/pages/partner/full-name.njk

@@ -0,0 +1,31 @@
+{{ govukInput({
+    label: {
+        text: i18n.addPartnerPersonPage.firstName,
+        classes: "govuk-label govuk-label--m",
+        isPageHeading: false
+    },
+    id: "forename",
+    name: "forename",
+    value: props.data[partner].data.forename,
+    classes: "govuk-!-width-full",
+    errorMessage: props.errors.forename if props.errors,
+    attributes : {
+        required: true
+    }
+}) }}
+
+{{ govukInput({
+    label: {
+        text: i18n.addPartnerPersonPage.lastName,
+        classes: "govuk-label govuk-label--m",
+        isPageHeading: false
+    },
+    id: "surname",
+    name: "surname",
+    value: props.data[partner].data.surname,
+    classes: "govuk-!-width-full",
+    errorMessage: props.errors.surname if props.errors,
+    attributes : {
+        required : true
+    }
+}) }}