From 34cbf349ca36a7e270cc1cb4f523c94b381f401d Mon Sep 17 00:00:00 2001 From: farres1 Date: Mon, 11 Dec 2023 15:20:32 +0000 Subject: [PATCH 1/6] Update roofing tiles --- schemas/business/en/qrt_0001.json | 80 ++++++++++++++++++------------- 1 file changed, 47 insertions(+), 33 deletions(-) diff --git a/schemas/business/en/qrt_0001.json b/schemas/business/en/qrt_0001.json index 5b3eb615..439dcecd 100644 --- a/schemas/business/en/qrt_0001.json +++ b/schemas/business/en/qrt_0001.json @@ -28,7 +28,7 @@ "code": "9995" }, { - "answer_id": "answer-driving-additional-new-sites", + "answer_id": "answer947c0c3a-b69d-4397-ad26-0983343e8e12", "code": "9994" }, { @@ -44,12 +44,12 @@ "code": "9991" }, { - "answer_id": "answerbf11b2d4-3f36-4466-8e59-4f8bc3cce4c8", - "code": "147" + "answer_id": "answerd88a4779-2421-43e6-9c6b-9ae111322d56", + "code": "9990" }, { - "answer_id": "add-another-additional-new-sites", - "code": "9990" + "answer_id": "answerbf11b2d4-3f36-4466-8e59-4f8bc3cce4c8", + "code": "147" }, { "answer_id": "answer27f27859-fc11-4577-b9bb-745407356498", @@ -58,6 +58,22 @@ { "answer_id": "answer6fd5d6f5-c9b0-4b69-8e62-435e4bc3db48", "code": "9988" + }, + { + "answer_id": "answerff677228-b845-426b-bb2a-85edf1b5ccf6", + "code": "9987" + }, + { + "answer_id": "answer862e1319-7fb5-41b8-b6c8-823c5a203c15", + "code": "9986" + }, + { + "answer_id": "answerd690df7b-584c-45ae-b6e7-e5a7c5c3f5c3", + "code": "9985" + }, + { + "answer_id": "answerb170d3f3-5d3f-479b-8f6e-6773a7fdaab8", + "code": "9984" } ], "title": "Quarterly Survey of Building Materials - Concrete Roofing Tiles", @@ -259,7 +275,7 @@ "question": "Local unit list", "contents": [ { - "description": "In this section you will be presented with your business's local units that this return covers. You will be asked to check the list for any errors and provide details of any changes." + "description": "In this section you will be presented with your business's local units that this return covers. You will be asked to check the list for any errors and provide details of any changes. If a unit is no longer covered by this return, include the date that it ceased production." } ] }, @@ -328,7 +344,7 @@ "description": "You will be asked to provide the details of production for concrete roofing tiles." }, { - "description": "This section includes:" + "description": "This includes:" }, { "list": [ @@ -345,10 +361,10 @@ } }, { - "id": "roofing-tiles-manufactured", + "id": "concrete-roofing-tiles-manufactured", "type": "Question", "question": { - "id": "questionroofing-tiles-manufactured", + "id": "questionconcrete-roofing-tiles-manufactured", "title": { "text": "For the period {ref_p_start_date} to {ref_p_end_date}, how many square metres of concrete roofing tiles were manufactured by {ru_name}?", "placeholders": [ @@ -418,7 +434,7 @@ } ] }, - "page_title": "Roofing tiles manufactured" + "page_title": "Concrete roofing tiles manufactured" }, { "id": "concrete-roofing-tiles-delivered", @@ -542,7 +558,7 @@ "title": "Local unit list", "contents": [ { - "description": "In this section you will presented with your business's local units that this return covers. You will be asked to check this list for any errors and provide details of any changes." + "description": "In this section you will presented with your business's local units that this return covers. You will be asked to check this list for any errors and provide details of any changes. If a unit is no longer covered by this return, include the date that it ceased production." } ] } @@ -560,7 +576,7 @@ }, { "list": [ - "if the unit is no longer appropriate, with the date that it ceased production" + "if the unit is no longer covered by this return, with the date that it ceased production" ] }, { @@ -599,19 +615,15 @@ "placeholder": "localunits_address", "transforms": [ { + "transform": "concatenate_list", "arguments": { - "delimiter": ", ", - "list_to_concatenate": [ - { - "source": "supplementary_data", - "identifier": "local-units", - "selectors": [ - "address" - ] - } - ] - }, - "transform": "concatenate_list" + "list_to_concatenate": { + "source": "supplementary_data", + "identifier": "local-units", + "selectors": ["address"] + }, + "delimiter": "," + } } ] } @@ -638,7 +650,7 @@ "type": "List", "for_list": "additional_units", "title": "What is the name, address, and postcode of the new unit?", - "item_anchor_answer_id": "answer27f27859-fc11-4577-b9bb-745407356498", + "item_anchor_answer_id": "27f27859-fc11-4577-b9bb-745407356498", "item_label": "

Name of new unit

", "related_answers": [ { @@ -839,7 +851,7 @@ "question": { "id": "questionnature-of-work-carried-on-at-the-new-unit", "title": { - "text": "What is the nature of work carried on at the new unit {name_of_new_unit} {address_and_postcode_of_new_unit}?", + "text": "What is the nature of work carried on at the new unit {name_of_new_unit}, {address_and_postcode_of_new_unit}?", "placeholders": [ { "placeholder": "name_of_new_unit", @@ -875,7 +887,7 @@ "question": { "id": "questionnumber-of-persons-employed-at-the-new-unit", "title": { - "text": "What is the number of persons employed at the new unit {name_of_new_unit} {address_and_postcode_of_new_unit}?", + "text": "What is the number of persons employed at the new unit {name_of_new_unit}, {address_and_postcode_of_new_unit}?", "placeholders": [ { "placeholder": "name_of_new_unit", @@ -912,7 +924,7 @@ "question": { "id": "questiondate-new-unit-came-into-production", "title": { - "text": "What date did the new unit {name_of_new_unit} {address_and_postcode_of_new_unit} come into production?", + "text": "What date did the new unit {name_of_new_unit}, {address_and_postcode_of_new_unit} come into production?", "placeholders": [ { "placeholder": "name_of_new_unit", @@ -1059,7 +1071,13 @@ "guidance": { "contents": [ { - "description": "Include comments on figures included in this return, for example, to explain any substantial fluctuations in your figures compared with those of the previous return." + "description": "Include:" + }, + { + "list": [ + "comments on figures included in this return, for example, to explain any substantial fluctuations in your figures compared with those of the previous return", + "any additional information about your business's local units" + ] } ] }, @@ -1110,10 +1128,6 @@ { "name": "ru_ref", "type": "string" - }, - { - "name": "user_id", - "type": "string" } ], "supplementary_data": { From 88b2f8b17f80787b1d86669801965fe3f0f4ef74 Mon Sep 17 00:00:00 2001 From: farres1 Date: Mon, 11 Dec 2023 15:26:06 +0000 Subject: [PATCH 2/6] Remove unused answer codes --- schemas/business/en/qrt_0001.json | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/schemas/business/en/qrt_0001.json b/schemas/business/en/qrt_0001.json index 439dcecd..45ce3346 100644 --- a/schemas/business/en/qrt_0001.json +++ b/schemas/business/en/qrt_0001.json @@ -58,22 +58,6 @@ { "answer_id": "answer6fd5d6f5-c9b0-4b69-8e62-435e4bc3db48", "code": "9988" - }, - { - "answer_id": "answerff677228-b845-426b-bb2a-85edf1b5ccf6", - "code": "9987" - }, - { - "answer_id": "answer862e1319-7fb5-41b8-b6c8-823c5a203c15", - "code": "9986" - }, - { - "answer_id": "answerd690df7b-584c-45ae-b6e7-e5a7c5c3f5c3", - "code": "9985" - }, - { - "answer_id": "answerb170d3f3-5d3f-479b-8f6e-6773a7fdaab8", - "code": "9984" } ], "title": "Quarterly Survey of Building Materials - Concrete Roofing Tiles", @@ -1128,6 +1112,10 @@ { "name": "ru_ref", "type": "string" + }, + { + "name": "user_id", + "type": "string" } ], "supplementary_data": { From d31bba95175969debacba8feb09df48c8e3306ca Mon Sep 17 00:00:00 2001 From: Jason Lavarinhas Date: Mon, 11 Dec 2023 15:49:44 +0000 Subject: [PATCH 3/6] Fix array error --- schemas/business/en/qrt_0001.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/schemas/business/en/qrt_0001.json b/schemas/business/en/qrt_0001.json index 45ce3346..498eeba4 100644 --- a/schemas/business/en/qrt_0001.json +++ b/schemas/business/en/qrt_0001.json @@ -601,11 +601,13 @@ { "transform": "concatenate_list", "arguments": { - "list_to_concatenate": { - "source": "supplementary_data", - "identifier": "local-units", - "selectors": ["address"] - }, + "list_to_concatenate": [ + { + "source": "supplementary_data", + "identifier": "local-units", + "selectors": ["address"] + } + ], "delimiter": "," } } From 6ca663e16ab9cd6a3ffcead98209bd4cd20f6a10 Mon Sep 17 00:00:00 2001 From: farres1 Date: Mon, 11 Dec 2023 16:06:03 +0000 Subject: [PATCH 4/6] Add answer prefix --- schemas/business/en/qrt_0001.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/business/en/qrt_0001.json b/schemas/business/en/qrt_0001.json index 45ce3346..f2e7f6f6 100644 --- a/schemas/business/en/qrt_0001.json +++ b/schemas/business/en/qrt_0001.json @@ -634,7 +634,7 @@ "type": "List", "for_list": "additional_units", "title": "What is the name, address, and postcode of the new unit?", - "item_anchor_answer_id": "27f27859-fc11-4577-b9bb-745407356498", + "item_anchor_answer_id": "answer27f27859-fc11-4577-b9bb-745407356498", "item_label": "

Name of new unit

", "related_answers": [ { From 575e31d3e1308405f295f13efa23ac66bc7673e9 Mon Sep 17 00:00:00 2001 From: farres1 Date: Mon, 11 Dec 2023 16:15:33 +0000 Subject: [PATCH 5/6] Add answer IDs to answer codes --- schemas/business/en/qrt_0001.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/business/en/qrt_0001.json b/schemas/business/en/qrt_0001.json index 03a02382..c978d22b 100644 --- a/schemas/business/en/qrt_0001.json +++ b/schemas/business/en/qrt_0001.json @@ -28,7 +28,7 @@ "code": "9995" }, { - "answer_id": "answer947c0c3a-b69d-4397-ad26-0983343e8e12", + "answer_id": "answer-driving-additional-new-sites", "code": "9994" }, { @@ -44,7 +44,7 @@ "code": "9991" }, { - "answer_id": "answerd88a4779-2421-43e6-9c6b-9ae111322d56", + "answer_id": "add-another-additional-new-sites", "code": "9990" }, { From dd32d8a2cdee6c5413cfd67b328de6ff61664336 Mon Sep 17 00:00:00 2001 From: farres1 Date: Mon, 11 Dec 2023 16:55:25 +0000 Subject: [PATCH 6/6] Add space --- schemas/business/en/qrt_0001.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/business/en/qrt_0001.json b/schemas/business/en/qrt_0001.json index c978d22b..dc551a19 100644 --- a/schemas/business/en/qrt_0001.json +++ b/schemas/business/en/qrt_0001.json @@ -608,7 +608,7 @@ "selectors": ["address"] } ], - "delimiter": "," + "delimiter": ", " } } ]