robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rep defect 45

Browse Source
This commit is contained in:
robbond
2025-02-07 12:44:03 +00:00
parent 4009fac494
commit f765411992
8 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/representationAgent.js
+10 -4
View File
@@ -124,7 +124,12 @@ const RepAgent = (props) => {
name="representationOnBehalfOf" name="representationOnBehalfOf"
datafieldname="representationOnBehalfOf" datafieldname="representationOnBehalfOf"
// label={t("myrepresentations:capacity-select-what-capacity-label")} // label={t("myrepresentations:capacity-select-what-capacity-label")}
options={["Yes", "No"]} options={[
t(
"myrepresentations:questionnaire-yes"
),
t("myrepresentations:questionnaire-no"),
]}
id="representationOnBehalfOf" id="representationOnBehalfOf"
className="govuk-radios__input" className="govuk-radios__input"
errorMsg={t( errorMsg={t(
@@ -132,9 +137,10 @@ const RepAgent = (props) => {
)} )}
component={RenderCondtionalRadioList} component={RenderCondtionalRadioList}
validate={[required]} validate={[required]}
legend={ legend={t("case:representation-onbehalfof")}
"Are you acting on behalf of a company, group or organisation?" hint={t(
} "myrepresentations:representation-onbehalfof-hint"
)}
/> />
</div> </div>
</div> </div>
components/case/representation/representationElements.js
+17 -8
View File
@@ -301,8 +301,7 @@ export const RenderCondtionalRadioList = ({
</legend> </legend>
<div id={id + "-hint"} className="govuk-hint"> <div id={id + "-hint"} className="govuk-hint">
e.g. "Owners of Numbers 1-5 High Street", or "Mr and Mrs {custom.hint}
Smith" or "The executors of Mr Evans' estate"
</div> </div>
<div className="govuk-radios"> <div className="govuk-radios">
{Object.keys(options).map((key, index) => ( {Object.keys(options).map((key, index) => (
@@ -346,8 +345,9 @@ export const RenderCondtionalRadioList = ({
className="govuk-label" className="govuk-label"
htmlFor={id + "_details"} htmlFor={id + "_details"}
> >
Enter the name of the {t(
company/group/organisation "myrepresentations:representation-onbehalfof-label"
)}
</label> </label>
<Field <Field
className="govuk-input govuk-!-width-one-half" className="govuk-input govuk-!-width-one-half"
@@ -1211,13 +1211,20 @@ export const RenderFileUpload = (field) => {
{uploadCountMessage > 0 && {uploadCountMessage > 0 &&
completedUploadFiles == false && ( completedUploadFiles == false && (
<div className="govuk-body govuk-!-font-size-14"> <div className="govuk-body govuk-!-font-size-14">
Uploading {uploadCountMessage} files{" "} {t("home:uploading-files-label", {
number: uploadCountMessage,
})}
</div> </div>
)} )}
{completedUploadFiles > 0 && {completedUploadFiles > 0 &&
uploadCountMessage > 0 && ( uploadCountMessage > 0 && (
<div className="govuk-body govuk-!-font-size-14"> <div className="govuk-body govuk-!-font-size-14">
{uploadCountMessage} files uploaded{" "} {t(
"home:completed-uploading-files-label",
{
number: uploadCountMessage,
}
)}
</div> </div>
)} )}
</section> </section>
@@ -1261,7 +1268,9 @@ export const RenderFileUpload = (field) => {
</p> </p>
) : ( ) : (
<p className="govuk-body textloading govuk-!-font-size-14"> <p className="govuk-body textloading govuk-!-font-size-14">
Uploading... {t(
"home:uploading-files-progress-label"
)}
</p> </p>
)} )}
</div> </div>
@@ -1290,7 +1299,7 @@ export const RenderFileUpload = (field) => {
blob.path.split("/")[1] blob.path.split("/")[1]
); );
}} }}
title="Remove this file" title={t("home:remove-this-file-label")}
> >
&minus; &minus;
</span> </span>
components/case/representation/representationInterestedPartyPerson.js
+10 -4
View File
@@ -127,7 +127,12 @@ const RepInterestedPartyPerson = (props) => {
name="representationOnBehalfOf" name="representationOnBehalfOf"
datafieldname="representationOnBehalfOf" datafieldname="representationOnBehalfOf"
// label="In what capacity do you wish to make representations on this case?" // label="In what capacity do you wish to make representations on this case?"
options={["Yes", "No"]} options={[
t(
"myrepresentations:questionnaire-yes"
),
t("myrepresentations:questionnaire-no"),
]}
id="representationOnBehalfOf" id="representationOnBehalfOf"
className="govuk-radios__input" className="govuk-radios__input"
errorMsg={t( errorMsg={t(
@@ -135,9 +140,10 @@ const RepInterestedPartyPerson = (props) => {
)} )}
component={RenderCondtionalRadioList} component={RenderCondtionalRadioList}
validate={[required]} validate={[required]}
legend={ legend={t("case:representation-onbehalfof")}
"Are you acting on behalf of a company, group or organisation?" hint={t(
} "myrepresentations:representation-onbehalfof-hint"
)}
/> />
</div> </div>
</div> </div>
components/elements/index.js
+13 -4
View File
@@ -2126,13 +2126,20 @@ const RenderFileUpload = (field) => {
{uploadCountMessage > 0 && {uploadCountMessage > 0 &&
completedUploadFiles == false && ( completedUploadFiles == false && (
<div className="govuk-body govuk-!-font-size-14"> <div className="govuk-body govuk-!-font-size-14">
Uploading {uploadCountMessage} files{" "} {t("home:uploading-files-label", {
number: uploadCountMessage,
})}
</div> </div>
)} )}
{completedUploadFiles > 0 && {completedUploadFiles > 0 &&
uploadCountMessage > 0 && ( uploadCountMessage > 0 && (
<div className="govuk-body govuk-!-font-size-14"> <div className="govuk-body govuk-!-font-size-14">
{uploadCountMessage} files uploaded{" "} {t(
"home:completed-uploading-files-label",
{
number: uploadCountMessage,
}
)}
</div> </div>
)} )}
</section> </section>
@@ -2188,7 +2195,9 @@ const RenderFileUpload = (field) => {
</p> </p>
) : ( ) : (
<p className="govuk-body textloading govuk-!-font-size-14"> <p className="govuk-body textloading govuk-!-font-size-14">
Uploading... {t(
"home:uploading-files-progress-label"
)}{" "}
</p> </p>
)} )}
</div> </div>
@@ -2223,7 +2232,7 @@ const RenderFileUpload = (field) => {
field.ticketnumber field.ticketnumber
); );
}} }}
title="Remove this file " title={t("home:remove-this-file-label")}
> >
&minus; &minus;
</span> </span>
locales/cy/home.json
+5 -1
View File
@@ -42,5 +42,9 @@
"dns-card-paragraph": "Mae Datblygiad o Arwyddocâd Cenedlaethol yn fath o gais cynllunio ar gyfer prosiect seilwaith mawr sydd o bwysigrwydd cenedlaethol.", "dns-card-paragraph": "Mae Datblygiad o Arwyddocâd Cenedlaethol yn fath o gais cynllunio ar gyfer prosiect seilwaith mawr sydd o bwysigrwydd cenedlaethol.",
"dns-card-button": "Gweld pob cais", "dns-card-button": "Gweld pob cais",
"logging-in-heading": "Rydym yn dilysu eich cyfrif. Arhoswch a pheidiwch ag adnewyddu'r dudalen", "logging-in-heading": "Rydym yn dilysu eich cyfrif. Arhoswch a pheidiwch ag adnewyddu'r dudalen",
"logging-in-paragraph": "Arhoswch os gwelwch yn dda..." "logging-in-paragraph": "Arhoswch os gwelwch yn dda...",
"uploading-files-progress-label": "Wrthi'n llwytho i fyny...",
"uploading-files-label": "Wrthi'n uwchlwytho {{number}} ffeil",
"completed-uploading-files-label": "{{number}} ffeil wedi'u huwchlwytho",
"remove-this-file-label": "Tynnu'r ffeil hon"
} }
locales/cy/myrepresentations.json
+3 -1
View File
@@ -237,5 +237,7 @@
"rep-finalising-label": "Wrthi'n uwchlwytho ffeiliau ar hyn o bryd ac yn cwblhau eich cyflwyniad cynrychioliad ", "rep-finalising-label": "Wrthi'n uwchlwytho ffeiliau ar hyn o bryd ac yn cwblhau eich cyflwyniad cynrychioliad ",
"rep-wait-label": "Arhoswch os gwelwch yn dda", "rep-wait-label": "Arhoswch os gwelwch yn dda",
"rep-period-passed-heading": "Mae'r cyfnod cynrychioli wedi mynd heibio", "rep-period-passed-heading": "Mae'r cyfnod cynrychioli wedi mynd heibio",
"rep-period-notice-label": "Aeth y dyddiad dyledus ar gyfer y sylw hwn heibio. Ni allwch gyflwyno'r wybodaeth a ddarparwyd gennych mwyach." "rep-period-notice-label": "Aeth y dyddiad dyledus ar gyfer y sylw hwn heibio. Ni allwch gyflwyno'r wybodaeth a ddarparwyd gennych mwyach.",
"representation-onbehalfof-hint": " e.e. \"Perchnogion Rhifau 1-5 Stryd Fawr\", neu \"Mr a Mrs Smith\" neu \"ysgutorion ystâd Mr Evans\"",
"representation-onbehalfof-label": "Rhowch enw'r cwmni/grŵp/sefydliad"
} }
locales/en/home.json
+5 -1
View File
@@ -42,5 +42,9 @@
"dns-card-paragraph": "A Development of National Significance is a type of planning application for a large infrastructure project of national importance.", "dns-card-paragraph": "A Development of National Significance is a type of planning application for a large infrastructure project of national importance.",
"dns-card-button": "View all applications", "dns-card-button": "View all applications",
"logging-in-heading": "We are authenticating your account please wait and don't refresh", "logging-in-heading": "We are authenticating your account please wait and don't refresh",
"logging-in-paragraph": "Please wait..." "logging-in-paragraph": "Please wait...",
"uploading-files-progress-label": "Uploading...",
"uploading-files-label": "Uploading {{number}} files",
"completed-uploading-files-label": "{{number}} files uploaded",
"remove-this-file-label": "Remove this file"
} }
locales/en/myrepresentations.json
+3 -1
View File
@@ -237,5 +237,7 @@
"rep-finalising-label": "Currently uploading files and finalising your representation submission", "rep-finalising-label": "Currently uploading files and finalising your representation submission",
"rep-wait-label": "Please wait", "rep-wait-label": "Please wait",
"rep-period-passed-heading": "Representation period has passed", "rep-period-passed-heading": "Representation period has passed",
"rep-period-notice-label": "The due date for this representation passed. You can no longer submit the information you have provided." "rep-period-notice-label": "The due date for this representation passed. You can no longer submit the information you have provided.",
"representation-onbehalfof-hint": "e.g. \"Owners of Numbers 1-5 High Street\", or \"Mr and Mrs Smith\" or \"The executors of Mr Evans' estate\"",
"representation-onbehalfof-label": "Enter the name of the company/group/organisation"
} }