From 130102ad302357b0fc2fc9447a415cba38de8e9b Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Mon, 10 Feb 2025 14:13:39 +0000
Subject: [PATCH] welsh text amends on reps

---
 .../representation/representationElements.js  | 67 ++++++++++---------
 components/myportal/topthree_reps.js          | 21 +++++-
 locales/cy/myrepresentations.json             |  8 +--
 3 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js
index 422844f7..06799dee 100644
--- a/components/case/representation/representationElements.js
+++ b/components/case/representation/representationElements.js
@@ -324,45 +324,46 @@ export const RenderCondtionalRadioList = ({
                                         className="govuk-label govuk-radios__label"
                                         htmlFor={id + "_" + index}
                                     >
-                                        {options[key]}
+                                        {options[key] == "Yes"
+                                            ? t(
+                                                  "myrepresentations:questionnaire-yes"
+                                              )
+                                            : t(
+                                                  "myrepresentations:questionnaire-no"
+                                              )}
                                     </label>
                                 </div>
-                                {value ==
-                                    t("myrepresentations:questionnaire-yes") &&
-                                    options[key] ==
-                                        t(
-                                            "myrepresentations:questionnaire-yes"
-                                        ) && (
+                                {value == "Yes" && options[key] == "Yes" && (
+                                    <div
+                                        className="govuk-radios__conditional "
+                                        id={"conditional-" + id}
+                                    >
                                         <div
-                                            className="govuk-radios__conditional "
-                                            id={"conditional-" + id}
+                                            className="govuk-form-group"
+                                            key={"yes_group_" + key}
                                         >
-                                            <div
-                                                className="govuk-form-group"
-                                                key={"yes_group_" + key}
+                                            <label
+                                                className="govuk-label"
+                                                htmlFor={id + "_details"}
                                             >
-                                                <label
-                                                    className="govuk-label"
-                                                    htmlFor={id + "_details"}
-                                                >
-                                                    {t(
-                                                        "myrepresentations:representation-onbehalfof-label"
-                                                    )}
-                                                </label>
-                                                <Field
-                                                    className="govuk-input govuk-!-width-one-half"
-                                                    id={id + "_details"}
-                                                    name={id + "_details"}
-                                                    component={RenderTextfield}
-                                                    type="text"
-                                                    validate={[required]}
-                                                    errorMsg={t(
-                                                        "myrepresentations:is-required-label"
-                                                    )}
-                                                />
-                                            </div>
+                                                {t(
+                                                    "myrepresentations:representation-onbehalfof-label"
+                                                )}
+                                            </label>
+                                            <Field
+                                                className="govuk-input govuk-!-width-one-half"
+                                                id={id + "_details"}
+                                                name={id + "_details"}
+                                                component={RenderTextfield}
+                                                type="text"
+                                                validate={[required]}
+                                                errorMsg={t(
+                                                    "myrepresentations:is-required-label"
+                                                )}
+                                            />
                                         </div>
-                                    )}
+                                    </div>
+                                )}
                             </div>
                         ))}
                     </div>
diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js
index f2249e3b..42930b34 100644
--- a/components/myportal/topthree_reps.js
+++ b/components/myportal/topthree_reps.js
@@ -285,10 +285,27 @@ const TopThree = (props) => {
                                   '$..[?(@.value=="' +
                                       showTopThreeArr[key]
                                           .representationCapacity +
-                                      '")].value_cy',
+                                      '"  ||@.value_cy=="' +
+                                      showTopThreeArr[key]
+                                          .representationCapacity +
+                                      '" )].value_cy',
                                   transLookup
                               )
-                            : showTopThreeArr[key].representationCapacity || ""}
+                            : jsonpath(
+                                  '$..[?(@.value_cy=="' +
+                                      showTopThreeArr[key]
+                                          .representationCapacity +
+                                      '")].value',
+                                  transLookup
+                              ).length > 0
+                            ? jsonpath(
+                                  '$..[?(@.value_cy=="' +
+                                      showTopThreeArr[key]
+                                          .representationCapacity +
+                                      '")].value',
+                                  transLookup
+                              )
+                            : showTopThreeArr[key].representationCapacity}
                     </div>
                     <div className="cardModuleReference">
                         <b>{t("myportal:date-raised")}:</b>
diff --git a/locales/cy/myrepresentations.json b/locales/cy/myrepresentations.json
index 92c402d6..63e755cc 100644
--- a/locales/cy/myrepresentations.json
+++ b/locales/cy/myrepresentations.json
@@ -46,10 +46,10 @@
     "rep-complete-para-three": "Byddwch yn derbyn cadarnhad yn fuan a anfonir at y cyfeiriad e-bost a roddwyd gennych.",
     "lpa-capacity-para-one": "Mae’r ffurflen hon yn eich galluogi i gyflwyno datganiadau, sylwadau a holiaduron ar achos i Benderfyniadau Cynllunio ac Amgylchedd Cymru.",
     "s78-section-heading-one": "Y weithdrefn apelio ac ymweliad safle",
-    "s78-section-question-1": "Cyfeirnod PCAC:",
-    "s78-section-question-2": "Cyfeirnod yr ACLl:",
-    "s78-section-question-4": "Math o apêl:",
-    "s78-section-question-3": "Cyfeiriad y Safle:",
+    "s78-section-question-1": "Cyfeirnod PCAC",
+    "s78-section-question-2": "Cyfeirnod yr ACLl",
+    "s78-section-question-4": "Math o apêl",
+    "s78-section-question-3": "Cyfeiriad y Safle",
     "s78-section-question-5": "Pa weithdrefn ydych chi'n credu y dylai'r apêl ei dilyn?",
     "s78-section-question-6": "A fydd angen i'r Arolygydd fynd i mewn i safle/eiddo'r apêl?",
     "s78-section-question-7": "A ydych chi'n credu bod angen i'r Arolygydd fynd ar dir/eiddo preifat cyfagos i weld y safle?",