added error messages (#106)

* added error messages * anyone-else-temp-away * visitor-list-coll
ONSdigital · Jun 26, 2020 · e4254f7 · e4254f7
1 parent 5a94807
commit e4254f7
Show file tree

Hide file tree

Showing 20 changed files with 500 additions and 8 deletions.
diff --git a/.../jsonnet/england-wales/household/blocks/who-lives-here/anyone_else_list_collector.jsonnet b/.../jsonnet/england-wales/household/blocks/who-lives-here/anyone_else_list_collector.jsonnet
@@ -32,6 +32,11 @@ local addQuestion(listIsEmpty) = {
       label: 'First name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+        },
+      },
     },
     {
       id: 'middle-names',
@@ -44,6 +49,11 @@ local addQuestion(listIsEmpty) = {
       label: 'Last name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+        },
+      },
     },
   ],
 };
@@ -72,6 +82,11 @@ local editQuestion(questionTitle) = {
       label: 'First name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+        },
+      },
     },
     {
       id: 'middle-names',
@@ -84,6 +99,11 @@ local editQuestion(questionTitle) = {
       label: 'Last name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+        },
+      },
     },
   ],
 };

diff --git a/...wales/household/blocks/who-lives-here/anyone_else_temporarily_away_list_collector.jsonnet b/...wales/household/blocks/who-lives-here/anyone_else_temporarily_away_list_collector.jsonnet
@@ -42,6 +42,11 @@ local editQuestion(questionTitle) = {
       label: 'First name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+        },
+      },
     },
     {
       id: 'middle-names',
@@ -54,6 +59,11 @@ local editQuestion(questionTitle) = {
       label: 'Last name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+        },
+      },
     },
   ],
 };
@@ -165,6 +175,11 @@ local editQuestion(questionTitle) = {
           label: 'First name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+            },
+          },
         },
         {
           id: 'middle-names',
@@ -177,6 +192,11 @@ local editQuestion(questionTitle) = {
           label: 'Last name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+            },
+          },
         },
       ],
     },

diff --git a/...onnet/england-wales/household/blocks/who-lives-here/primary_person_list_collector.jsonnet b/...onnet/england-wales/household/blocks/who-lives-here/primary_person_list_collector.jsonnet
@@ -21,6 +21,11 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
           label: 'First name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+            },
+          },
         },
         {
           id: 'middle-names',
@@ -33,6 +38,11 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
           label: 'Last name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+            },
+          },
         },
       ],
     },

diff --git a/source/jsonnet/england-wales/household/blocks/who-lives-here/visitor_list_collector.jsonnet b/source/jsonnet/england-wales/household/blocks/who-lives-here/visitor_list_collector.jsonnet
@@ -28,12 +28,22 @@ local addQuestion(visitorsListEmpty) = {
       label: 'First name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+        },
+      },
     },
     {
       id: 'last-name',
       label: 'Last name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+        },
+      },
       guidance: {
         show_guidance: 'Why we ask about visitors',
         hide_guidance: 'Why we ask about visitors',
@@ -132,12 +142,22 @@ local addQuestion(visitorsListEmpty) = {
           label: 'First name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+            },
+          },
         },
         {
           id: 'last-name',
           label: 'Last name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+            },
+          },
         },
       ],
     },

diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/arrive_in_country.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/arrive_in_country.jsonnet
@@ -9,7 +9,7 @@ local question(title) = {
   answers: [
     {
       id: 'arrive-in-country-answer',
-      mandatory: false,
+      mandatory: true,
       type: 'MonthYearDate',
       minimum: {
         value: {
@@ -20,6 +20,11 @@ local question(title) = {
       maximum: {
         value: 'now',
       },
+      validation: {
+        messages: {
+          MANDATORY_DATE: 'Enter date of arrival to continue',
+        },
+      },
     },
   ],
 };

diff --git a/...onnet/england-wales/individual/blocks/personal-details/another_address_outside_uk.jsonnet b/...onnet/england-wales/individual/blocks/personal-details/another_address_outside_uk.jsonnet
@@ -14,6 +14,11 @@ local question(title) = {
       mandatory: true,
       suggestions_url: 'https://cdn.eq.census-gcp.onsdigital.uk/data/v1.0.0/countries-of-birth.json',
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a country to continue',
+        },
+      },
     },
   ],
 };

diff --git a/source/jsonnet/england-wales/individual/blocks/personal-details/date_of_birth.jsonnet b/source/jsonnet/england-wales/individual/blocks/personal-details/date_of_birth.jsonnet
@@ -28,6 +28,11 @@ local question(title) = {
       maximum: {
         value: 'now',
       },
+      validation: {
+        messages: {
+          MANDATORY_DATE: 'Enter a date of birth to continue',
+        },
+      },
     },
   ],
 };

diff --git a/source/jsonnet/england-wales/individual/blocks/personal-details/other_uk_address.jsonnet b/source/jsonnet/england-wales/individual/blocks/personal-details/other_uk_address.jsonnet
@@ -11,6 +11,11 @@ local question(title) = {
       label: 'Address line 1',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter an address to continue',
+        },
+      },
     },
     {
       id: 'other-address-answer-street',

diff --git a/...onnet/northern-ireland/household/blocks/who-lives-here/anyone_else_list_collector.jsonnet b/...onnet/northern-ireland/household/blocks/who-lives-here/anyone_else_list_collector.jsonnet
@@ -32,6 +32,11 @@ local addQuestion(listIsEmpty) = {
       label: 'First name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+        },
+      },
     },
     {
       id: 'middle-names',
@@ -44,6 +49,11 @@ local addQuestion(listIsEmpty) = {
       label: 'Last name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+        },
+      },
     },
   ],
 };
@@ -72,6 +82,11 @@ local editQuestion(questionTitle) = {
       label: 'First name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+        },
+      },
     },
     {
       id: 'middle-names',
@@ -84,6 +99,11 @@ local editQuestion(questionTitle) = {
       label: 'Last name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+        },
+      },
     },
   ],
 };

diff --git a/...eland/household/blocks/who-lives-here/anyone_else_temporarily_away_list_collector.jsonnet b/...eland/household/blocks/who-lives-here/anyone_else_temporarily_away_list_collector.jsonnet
@@ -64,6 +64,11 @@ local editQuestion(questionTitle) = {
       label: 'First name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+        },
+      },
     },
     {
       id: 'middle-names',
@@ -76,6 +81,11 @@ local editQuestion(questionTitle) = {
       label: 'Last name',
       mandatory: true,
       type: 'TextField',
+      validation: {
+        messages: {
+          MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+        },
+      },
     },
   ],
 };
@@ -182,6 +192,11 @@ local editQuestion(questionTitle) = {
           label: 'First name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+            },
+          },
         },
         {
           id: 'middle-names',
@@ -194,6 +209,11 @@ local editQuestion(questionTitle) = {
           label: 'Last name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+            },
+          },
         },
       ],
     },

diff --git a/...et/northern-ireland/household/blocks/who-lives-here/primary_person_list_collector.jsonnet b/...et/northern-ireland/household/blocks/who-lives-here/primary_person_list_collector.jsonnet
@@ -28,6 +28,11 @@ local questionTitle = {
           label: 'First name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+            },
+          },
         },
         {
           id: 'middle-names',
@@ -40,6 +45,11 @@ local questionTitle = {
           label: 'Last name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+            },
+          },
         },
       ],
     },

diff --git a/...e/jsonnet/northern-ireland/household/blocks/who-lives-here/visitor_list_collector.jsonnet b/...e/jsonnet/northern-ireland/household/blocks/who-lives-here/visitor_list_collector.jsonnet
@@ -97,6 +97,11 @@ local removePersonQuestionTitle = {
           label: 'First name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+            },
+          },
         },
         {
           id: 'last-name',
@@ -112,6 +117,11 @@ local removePersonQuestionTitle = {
               },
             ],
           },
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+            },
+          },
         },
       ],
     },
@@ -129,12 +139,22 @@ local removePersonQuestionTitle = {
           label: 'First name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a first name to continue',
+            },
+          },
         },
         {
           id: 'last-name',
           label: 'Last name',
           mandatory: true,
           type: 'TextField',
+          validation: {
+            messages: {
+              MANDATORY_TEXTFIELD: 'Enter a last name to continue',
+            },
+          },
         },
       ],
     },