CCS corrections mop-up 1 (#119)

* CCS corrections mop-up 1

source/jsonnet/england-wales/ccs/blocks/accommodation/accommodation_type.jsonnet

@@ -4,7 +4,7 @@ local rules = import 'rules.libsonnet';
 local question(title) = {
   id: 'accommodation-type-question',
   title: title,
-  instruction: 'Tell respondent to turn to <strong>Showcard 3</strong> or show them the options below',
+  instruction: 'Tell the respondent to turn to <strong>Showcard 3</strong> or show them the options below',
   type: 'General',
   answers: [
     {

source/jsonnet/england-wales/ccs/blocks/accommodation/own_or_rent.jsonnet

@@ -3,7 +3,7 @@ local rules = import 'rules.libsonnet';
 local question(title, options) = {
   id: 'own-or-rent-question',
   title: title,
-  instruction: 'Tell respondent to turn to <strong>Showcard 4</strong> or show them the options below',
+  instruction: 'Tell the respondent to turn to <strong>Showcard 4</strong> or show them the options below',
   type: 'General',
   answers: [{
     id: 'own-or-rent-answer',

source/jsonnet/england-wales/ccs/blocks/accommodation/who_rent_from.jsonnet

@@ -3,7 +3,7 @@ local rules = import 'rules.libsonnet';
 local question(title) = {
   id: 'who-rent-from-question',
   title: title,
-  instruction: 'Tell respondent to turn to <strong>Showcard 5</strong> or show them the options below',
+  instruction: 'Tell the respondent to turn to <strong>Showcard 5</strong> or show them the options below',
   type: 'General',
   answers: [{
     id: 'who-rent-from-answer',

source/jsonnet/england-wales/ccs/blocks/household-check/other_living_accommodation.jsonnet

@@ -5,21 +5,15 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
   id: 'other-living-accommodation',
   question: {
     id: 'other-living-accommodation-question',
+    description: 'For example, separate bedsits, annexes, sheds',
     title: {
       text: 'Is there any other living accommodation at {household_address}?',
       placeholders: [
         placeholders.address,
       ],
     },
     type: 'General',
-    guidance: {
-      contents: [
-        {
-          description: 'For example, separate bedsits, annexes, sheds etc',
-        },
-      ],
-    },
-    instruction: 'If “Yes” ensure this accommodation is recorded on the Fieldwork Management Tool and interview household separately',
+    instruction: 'If yes, ensure this accommodation is recorded on the Fieldwork Management Tool and interview household',
     answers: [{
       id: 'other-living-accommodation-answer',
       mandatory: false,

source/jsonnet/england-wales/ccs/blocks/household-check/separate_household.jsonnet

@@ -5,27 +5,22 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
   id: 'separate-household',
   question: {
     id: 'separate-household-question',
+    description: 'A <strong>household</strong> is one person living alone, or a group of people (not necessarily related), who share cooking facilities <strong>and</strong> share a living room, <strong>or</strong> sitting room, <strong>or</strong> dining area',
+    instruction: 'If yes, record these people on the Fieldwork Management Tool and interview them, if at this address',
     title: {
       text: 'Was there anyone living at your address on {census_date} that you have not included because they lived in a separate household?',
       placeholders: [
         placeholders.censusDate,
       ],
     },
     type: 'General',
-    guidance: {
-      contents: [
-        {
-          description: 'A <strong>household</strong> is one person living alone, or a group of people (not necessarily related), who share cooking facilities <strong>and</strong> share a living room, <strong>or</strong> sitting room, <strong>or</strong> dining area',
-        },
-      ],
-    },
     answers: [{
       id: 'separate-household-answer',
       mandatory: false,
       options: [
         {
-          label: 'Yes, record these people on the Fieldwork Management Tool and interview them',
-          value: 'Yes, record these people on the Fieldwork Management Tool and interview them',
+          label: 'Yes',
+          value: 'Yes',
         },
         {
           label: 'No',

source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group.jsonnet

@@ -42,7 +42,7 @@ local question(title, regionStrings, region_code) = (
           {
             label: 'Mixed or Multiple ethnic groups',
             value: 'Mixed or Multiple ethnic groups',
-            description: 'Includes White and Black Caribbean, White and Black African, White and Asian or any other Mixed or Multiple',
+            description: 'Includes White and Black Caribbean, White and Black African, White and Asian or any other Mixed or Multiple background',
           },
           {
             label: regionStrings.asianOption,

source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_asian.jsonnet

@@ -57,7 +57,7 @@ local question(title, instruction) = {
             id: 'asian-ethnic-group-answer-other',
             type: 'TextField',
             mandatory: false,
-            label: 'Enter Asian background',
+            label: 'Enter Asian ethnic group or background',
           },
         },
       ],

source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_black.jsonnet

@@ -56,7 +56,7 @@ local question(title, instruction) = {
             id: 'black-ethnic-group-answer-other',
             type: 'TextField',
             mandatory: false,
-            label: 'Enter Black, Black British or Caribbean background',
+            label: 'Enter Black, Black British or Caribbean ethnic group or background',
           },
         },
       ],

source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_mixed.jsonnet

@@ -34,7 +34,7 @@ local question(title, instruction) = {
             id: 'mixed-ethnic-group-answer-other',
             type: 'TextField',
             mandatory: false,
-            label: 'Enter Mixed or Multiple background',
+            label: 'Enter Mixed or Multiple ethnic group or background',
           },
         },
       ],

source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_other.jsonnet

@@ -26,7 +26,7 @@ local question(title, instruction) = {
             id: 'other-ethnic-group-answer-other',
             type: 'TextField',
             mandatory: false,
-            label: 'Enter other ethnic group',
+            label: 'Enter other ethnic group or background',
           },
         },
       ],

source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_white.jsonnet

@@ -51,7 +51,7 @@ local question(title, instruction, region_code) = (
               id: 'white-ethnic-group-answer-other',
               type: 'TextField',
               mandatory: false,
-              label: 'Enter White background',
+              label: 'Enter White ethnic group or background',
             },
           },
         ],

source/jsonnet/england-wales/ccs/blocks/individual/past_usual_household_address.jsonnet

@@ -36,7 +36,7 @@ local nonProxyTitle = {
   ],
 };
 local proxyTitle = {
-  text: 'Was {person_name_possessive} usual address one year ago, on {year_before_census_date}, the same as their usual address on {census_date}?',
+  text: 'Was <em>{person_name_possessive}</em> usual address one year ago, on {year_before_census_date}, the same as their usual address on {census_date}?',
   placeholders: [
     placeholders.personNamePossessive,
     placeholders.yearBeforeCensusDate,

source/jsonnet/england-wales/ccs/blocks/visitor/usual_household_address.jsonnet

@@ -30,12 +30,12 @@ local question(additionalAnwerOptions=[]) = {
       mandatory: false,
       options: additionalAnwerOptions + [
         {
-          label: 'An address in the UK',
-          value: 'An address in the UK',
+          label: 'Yes',
+          value: 'Yes',
         },
         {
-          label: 'An address outside the UK',
-          value: 'An address outside the UK',
+          label: 'No',
+          value: 'No',
           description: 'Select to enter answer',
           detail_answer: {
             id: 'usual-address-household-answer-other',
@@ -71,7 +71,7 @@ local question(additionalAnwerOptions=[]) = {
           {
             id: 'usual-address-household-answer',
             condition: 'equals',
-            value: 'An address in the UK',
+            value: 'Yes',
           },
         ],
       },

source/jsonnet/england-wales/ccs/blocks/who-lives-here/any_visitors.jsonnet

@@ -37,7 +37,7 @@ local question(livesAtHouseholdAddress) = {
   id: 'any-visitors-question',
   title: questionTitle(livesAtHouseholdAddress),
   description: 'A visitor is a person staying overnight who usually lives at another address',
-  instruction: 'Tell the respondent to turn to <strong>Showcard 13</strong> or show them the Electronic Showcard below',
+  instruction: 'Tell the respondent to turn to <strong>Showcard 13</strong> or show them the <strong>Electronic Showcard</strong> below',
   definitions: [
     {
       title: 'Electronic Showcard',

source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_list_collector.jsonnet

@@ -68,7 +68,7 @@ local editQuestion(questionTitle) = {
         id: 'anyone-usually-live-at-question',
         title: questionTitle,
         description: 'Remember to only include those people who share cooking facilities <strong>and</strong> share a living room, <strong>or</strong> sitting room, <strong>or</strong> dining area.<p><strong>Anyone else is not part of your household and will be interviewed separately.</strong></p>',
-        instruction: 'Tell the respondent to turn to <strong>Showcard 2</strong> or show them the Electronic Showcard below',
+        instruction: 'Tell the respondent to turn to <strong>Showcard 2</strong> or show them the <strong>Electronic Showcard</strong> below',
         definitions: [
           {
             title: 'Electronic Showcard',
@@ -128,7 +128,7 @@ local editQuestion(questionTitle) = {
           ],
         },
         description: 'Remember to only include those people who share cooking facilities <strong>and</strong> share a living room, <strong>or</strong> sitting room, <strong>or</strong> dining area.<p><strong>Anyone else is not part of your household and will be interviewed separately.</strong></p>',
-        instruction: 'Tell the respondent to turn to <strong>Showcard 2</strong> or show them the Electronic Showcard below',
+        instruction: 'Tell the respondent to turn to <strong>Showcard 2</strong> or show them the <strong>Electronic Showcard</strong> below',
         definitions: [
           {
             title: 'Electronic Showcard',

source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_temp_away_list_collector.jsonnet

@@ -58,7 +58,7 @@ local editQuestion(questionTitle) = {
     id: 'anyone-else-temp-away-confirmation-question',
     type: 'General',
     title: 'Apart from the people already included, is there anyone else who was temporarily away or staying that you need to add?',
-    instruction: 'Tell the respondent to double-check <strong>Showcard 2</strong> or show them the Electronic Showcard below',
+    instruction: 'Tell the respondent to double-check <strong>Showcard 2</strong> or show them the <strong>Electronic Showcard</strong> below',
     definitions: [
       {
         title: 'Electronic Showcard',

source/jsonnet/england-wales/ccs/blocks/who-lives-here/outside_uk_note.jsonnet

@@ -5,16 +5,12 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
   id: 'outside-uk-note',
   content: {
     title: 'Interviewer Note',
-    contents: [
-      {
-        description: {
-          text: 'If the respondent was living outside the UK on Sunday {census_date}, please explain that they do not need to complete the questionnaire and end interview.',
-          placeholders: [
-            placeholders.censusDate,
-          ],
-        },
-      },
-    ],
+    instruction: {
+      text: 'If the respondent was living outside the UK on Sunday {census_date}, please explain that they do not need to complete the questionnaire and end interview',
+      placeholders: [
+        placeholders.censusDate,
+      ],
+    },
   },
   routing_rules: [
     {

source/jsonnet/england-wales/ccs/blocks/who-lives-here/primary_person_list_collector.jsonnet

@@ -47,7 +47,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
         placeholders.censusDate,
       ],
     },
-    instruction: 'Tell the respondent to turn to <strong>Showcard 1</strong> or show them the Electronic Showcard below',
+    instruction: 'Tell the respondent to turn to <strong>Showcard 1</strong> or show them the <strong>Electronic Showcard</strong> below',
     definitions: [
       {
         title: 'Electronic Showcard',

source/jsonnet/england-wales/ccs/blocks/who-lives-here/usual_address_in_uk.jsonnet

@@ -5,6 +5,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
   id: 'usual-address-in-uk',
   question: {
     id: 'usual-address-in-uk-question',
+    description: '“Usual address” means the address at which you generally spend most time, for most people this will be their permanent or family home',
     title: {
       text: 'On Sunday {census_date}, was your usual address in the UK?',
       placeholders: [

source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_lives_here_interstitial.jsonnet

@@ -4,7 +4,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet';
   type: 'Interstitial',
   id: 'who-lives-here-interstitial',
   content: {
-    title: 'Household definition',
+    title: 'Your household',
     contents: [
       {
         description: {

source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_to_interview_note.jsonnet

@@ -3,14 +3,7 @@
   id: 'who-to-interview-note',
   content: {
     title: '<em>Interviewer Note</em>',
-    contents: [
-      {
-        description: 'Only interview a person who was usually living at the property on census night.',
-      },
-      {
-        description: 'If none of those household members are available, you must save and sign out of the survey and return to the address to interview one of them at a later date.',
-      },
-    ],
+    instruction: 'If the respondent was not living at the property on census night, but other current household members were, you must speak to one of those household members instead. <p>If none of those household members are available, you must return to the address to interview one of them at a later date.</p>',
   },
   routing_rules: [
     {

source/jsonnet/england-wales/ccs_household.jsonnet

@@ -110,7 +110,7 @@ function(region_code, census_month_year_date) {
   sections: [
     {
       id: 'who-lives-here-section',
-      title: 'This section is now complete',
+      title: 'Household members and visitors',
       summary: {
         show_on_completion: true,
         items: [