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

Merged PR 1331: UAt fixes

Browse Source 
Related work items: #12924, #12952
This commit is contained in:
Robert Bond
2024-12-05 17:31:40 +00:00
parent 57d8ffc4f3 9734bffee3
commit 3dd9a7586f
34 changed files with 226 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/selectQueryTypes.js
+1 -1
View File
@@ -20,7 +20,7 @@ export const getSelectQuery = (appealTypeName) => {
return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate";
break;
case "pinswg_communityinfrastructurelevys117118119s":
return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_questionnaireduedate,pinswg_statementduedate";
break;
case "pinswg_compulsorypurchaseorderses":
return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate";
components/case/representation/index.js
+11 -6
View File
@@ -1237,8 +1237,6 @@ let MakeRepresentation = (props) => {
{t(
"myrepresentations:timetable-title"
)}{" "}
{currentView.caseReference
.appealType == 846040011}
</h2>
<div className="govuk-summary-list">
<div className="govuk-body-s">
@@ -1253,10 +1251,17 @@ let MakeRepresentation = (props) => {
:
<span className="govuk-body-s">
{" "}
{formatDates(
detailsObj.pinswg_questionnaireduedate ||
detailsObj.pinswg_endofrepresentationperiod
)}
{detailsObj.hasOwnProperty(
"pinswg_questionnaireduedate"
) ||
detailsObj.hasOwnProperty(
"pinswg_endofrepresentationperiod"
)
? formatDates(
detailsObj.pinswg_questionnaireduedate ||
detailsObj.pinswg_endofrepresentationperiod
)
: "N/A"}
</span>
</div>
<div className="govuk-body-s">
components/case/representation/representationLPA.js
+1
View File
@@ -118,6 +118,7 @@ let RepLPA = (props) => {
case 846040003:
case 846040009:
case 846040008:
case 846040010:
case 846040017:
return (
<RepresentationProgress_s78
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+1 -1
View File
@@ -1228,7 +1228,7 @@ let Enforcement_Questionnaire = (props) => {
label={t("myrepresentations:enf-section-question-date")}
component={RenderDatePicker}
validate={[required]}
errorMsg="Select a date"
errorMsg={t("newappeal:select-a-date-label")}
dateStart="0"
dateEnd="1-y"
/>
components/elements/index.js
+54 -35
View File
@@ -116,8 +116,6 @@ export function Textfield(props) {
maxFieldLength,
hint,
} = props;
// const required = (value) =>
// value ? undefined : t("newappeal:is-required-label");
const required = (value) => {
let errors;
@@ -239,7 +237,7 @@ export function Textfield(props) {
className="govuk-input govuk-input--width-20"
validate={eval(validation)}
label={props.label}
errorMsg="Is required"
errorMsg={t("newappeal:is-required-label")}
maxFieldLength={props.maxFieldLength}
/>
)}
@@ -319,14 +317,14 @@ export function MultiLinefield(props) {
// Check for the required field
if (!value) {
errors = "This field is required";
errors = t("newappeal:is-required-label");
} else {
// Check for emojis using a regular expression
const emojiRegex =
/[\u{1F600}-\u{1F64F}\u{1F300}-\u{1F5FF}\u{1F680}-\u{1F6FF}\u{1F700}-\u{1F77F}\u{1F780}-\u{1F7FF}\u{1F800}-\u{1F8FF}\u{1F900}-\u{1F9FF}\u{1FA00}-\u{1FA6F}\u{1FA70}-\u{1FAFF}\u{2600}-\u{26FF}\u{2700}-\u{27BF}\u{2300}-\u{23FF}\u{2B50}\u{1F004}-\u{1F0CF}\u{1F0A0}-\u{1F0A5}\u{1F170}-\u{1F251}]/gu;
if (emojiRegex.test(value)) {
errors = "Emojis are not allowed";
errors = t("newappeal:emojis-not-allowed-label");
}
}
@@ -492,7 +490,8 @@ export function RichMultiLinefield(props) {
validation,
maxFieldLength,
} = props;
const required = (value) => (value ? undefined : "Is required");
const required = (value) =>
value ? undefined : t("newappeal:is-required-label");
var showIfHasParentShowValue =
parentField != false &&
@@ -702,6 +701,7 @@ export function DateFieldPicker(props) {
dateStart,
dateEnd,
} = props;
let { t } = useTranslation();
const required = (value) => (value ? undefined : "Required");
var showIfHasParentShowValue =
@@ -720,7 +720,7 @@ export function DateFieldPicker(props) {
label={label}
component={RenderDatePicker}
validate={eval(validation)}
errorMsg="Select a date"
errorMsg={t("newappeal:select-a-date-label")}
dateStart={dateStart}
dateEnd={dateEnd}
hint={props.hint}
@@ -733,7 +733,7 @@ export function DateFieldPicker(props) {
label={label}
component={RenderDatePicker}
validate={eval(validation)}
errorMsg="Select a date"
errorMsg={t("newappeal:select-a-date-label")}
dateStart={dateStart}
dateEnd={dateEnd}
hint={props.hint}
@@ -1318,7 +1318,9 @@ const RenderPickList = ({
dropdownObj = dropdownObj[0];
const required = (value) => {
return value || value == 0 ? undefined : "Is required";
return value || value == 0
? undefined
: t("newappeal:is-required-label");
};
return (
@@ -1363,7 +1365,9 @@ export function PickList(props) {
const { name, label, datafieldname, hint } = props;
let { t } = useTranslation();
const required = (value) => {
return value || value == 0 ? undefined : "Is required";
return value || value == 0
? undefined
: t("newappeal:is-required-label");
};
return (
<Field
@@ -1374,7 +1378,7 @@ export function PickList(props) {
datafieldname={datafieldname}
picklistData={props.picklistData}
hint={props.hint}
errorMsg="Is required"
errorMsg={t("newappeal:is-required-label")}
validate={[required]}
/>
);
@@ -1391,12 +1395,19 @@ export function NumericField(props) {
parentField,
maxFieldLength,
} = props;
let { t } = useTranslation();
const required = (value) => {
return value || value == 0 ? undefined : "Is required";
return value || value == 0
? undefined
: t("newappeal:is-required-label");
};
const isNumber = (value) => {
const regex = /^\d*\.?\d{0,1}$/;
return regex.test(value) ? undefined : "Should be a number";
return regex.test(value)
? undefined
: t("newappeal:invalid-number-label");
};
const maxLength = (max) => (value) =>
@@ -1495,11 +1506,17 @@ export function DecimalField(props) {
parentField,
maxFieldLength,
} = props;
const required = (value) => (value ? undefined : "Is required");
let { t } = useTranslation();
const required = (value) =>
value ? undefined : t("newappeal:is-required-label");
const isNumber = (value) => {
const regex = /^\d*\.?\d{0,1}$/;
return regex.test(value) ? undefined : "Should be a number or decimal";
return regex.test(value)
? undefined
: t("newappeal:invalid-number-label");
};
const maxLength = (max) => (value) =>
@@ -1521,6 +1538,24 @@ export function DecimalField(props) {
//console.log("parentField:", parentField, showIfHasParentShowValue);
const normalizeDecimal = (value) => {
return value ? parseFloat(value) : value;
};
const validateDecimal = (value) => {
if (!value) return t("newappeal:is-required-label");
// Regex to match whole numbers or decimal numbers (up to 7 characters including decimal)
const regex = /^\d{1,6}(\.\d{1,2})?$/; // Up to 6 digits before the decimal, 2 after
// Check if the value matches the regex pattern
if (!regex.test(value)) {
return t("newappeal:invalid-decimal-label");
}
return undefined;
};
return (
<>
{parentField != false ? (
@@ -1557,7 +1592,7 @@ export function DecimalField(props) {
pattern="^\d*\.?\d+$"
// inputMode="numeric"
// parse={Number}
validate={validateDecimal}
validate={[validateDecimal]}
component={RenderDecimalField}
label={props.label}
maxFieldLength={props.maxFieldLength}
@@ -1569,24 +1604,6 @@ export function DecimalField(props) {
);
}
const normalizeDecimal = (value) => {
return value ? parseFloat(value) : value;
};
const validateDecimal = (value) => {
if (!value) return "This field is required";
// Regex to match whole numbers or decimal numbers (up to 7 characters including decimal)
const regex = /^\d{1,6}(\.\d{1,2})?$/; // Up to 6 digits before the decimal, 2 after
// Check if the value matches the regex pattern
if (!regex.test(value)) {
return "Invalid number (max 7 characters, 2 decimal places)";
}
return undefined;
};
const RenderDecimalField = ({
name,
id,
@@ -2010,7 +2027,9 @@ const RenderFileUpload = (field) => {
)}
</>
)}
{blobList.length > 0 && <h4>Previously added files</h4>}
{blobList.length > 0 && (
<h4>{t("newappeal:previously-added-files")}</h4>
)}
{blobList.map(
(blob, i) =>
blob.documentType == field.documentTypeCode && (
components/newappeal/buildfield.js
+2 -1
View File
@@ -96,7 +96,8 @@ export default function BuildField(props) {
);
break;
case "{4273EDBD-AC1D-40d3-9FB2-095C621B552D}":
const required = (value) => (value ? undefined : "Is required");
const required = (value) =>
value ? undefined : t("newappeal:is-required-label");
return (
<Textfield
components/newappeal/buildprogress.js
+16 -5
View File
@@ -186,7 +186,7 @@ const BuildProgress = (props) => {
<ul className="govuk-list ">
<li className="at-nav__page">
<ol className="govuk-list govuk-list--bullet">
<li>Application form</li>
<li>{t("newappeal:application-form")}</li>
{props.props.props.form.hasOwnProperty(
"appealForm"
@@ -223,7 +223,9 @@ const BuildProgress = (props) => {
.values.pinswg_caseworkreason ==
"846040005" && (
<li>
Registration of Application letter
{t(
"newappeal:registration-of-application-letter"
)}
</li>
)
: ""}
@@ -255,7 +257,11 @@ const BuildProgress = (props) => {
].values.hasOwnProperty("pinswg_attachsoc")
? props.props.props.form["appealForm"]
.values.pinswg_attachsoc ==
"true" && <li>Statement of Case</li>
"true" && (
<li>
{t("newappeal:statement-of-case")}
</li>
)
: ""}
{props.props.props.form.hasOwnProperty(
@@ -272,7 +278,11 @@ const BuildProgress = (props) => {
? props.props.props.form["appealForm"]
.values
.pinswg_attachcostapplication ==
"true" && <li>Cost Application</li>
"true" && (
<li>
{t("newappeal:cost-application")}
</li>
)
: ""}
{props.props.props.form.hasOwnProperty(
@@ -303,7 +313,8 @@ const BuildProgress = (props) => {
return <li key={key}>{value}</li>;
}
)} */}
<li>Site Location Plan</li>
<li>{t("newappeal:site-location-plan")}</li>
</ol>
</li>
</ul>
components/newappeal/buildsection.js
+17 -5
View File
@@ -626,12 +626,14 @@ const mapStateToProps = (state, ownProps) => {
formData: state.formData,
appealType: state.appealType,
initialValues: state.appealType.caseReference.caseDetails,
currentView: state.currentView,
}
: {
search: state.search,
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
currentView: state.currentView,
//form: state.form,
};
};
@@ -658,22 +660,28 @@ const mapDispatchToProps = (dispatch) => {
const selector = formValueSelector("appealForm"); // <-- same as form name
const validate = (values) => {
const validate = (values, props) => {
const errors = {};
const strippedHtml = (htmlStr) => {
return htmlStr.replace(/(<([^>]+)>)/gi, "").trim();
};
const locale = props.currentView.locale;
if (values.hasOwnProperty("pinswg_attachsoc")) {
if (values.pinswg_attachsoc == "false") {
if (values.hasOwnProperty("pinswg_statementofcase")) {
if (strippedHtml(values.pinswg_statementofcase).length == 0)
errors.pinswg_statementofcase =
"Submit your Statement of Case or select Yes to attach a separate Statement of Case Document";
locale != "cy"
? "Submit your Statement of Case or select Yes to attach a separate Statement of Case Document"
: "Cyflwynwch eich Datganiad Achos neu dewiswch Ie i atodi Dogfen Datganiad Achos ar wahân";
} else {
errors.pinswg_statementofcase =
"Submit your Statement of Case or select Yes to attach a separate Statement of Case Document";
locale != "cy"
? "Submit your Statement of Case or select Yes to attach a separate Statement of Case Document"
: "Cyflwynwch eich Datganiad Achos neu dewiswch Ie i atodi Dogfen Datganiad Achos ar wahân";
}
}
}
@@ -684,10 +692,14 @@ const validate = (values) => {
if (values.hasOwnProperty("pinswg_costapplication")) {
if (strippedHtml(values.pinswg_costapplication).length == 0)
errors.pinswg_costapplication =
"Submit a Costs application or select Yes to attach a separate Costs application";
locale != "cy"
? "Submit a Costs application or select Yes to attach a separate Costs application"
: "Cyflwyno cais Costau neu ddewis Ie i atodi cais Costau ar wahân";
} else {
errors.pinswg_costapplication =
"Submit a Costs application or select Yes to attach a separate Costs application";
locale != "cy"
? "Submit a Costs application or select Yes to attach a separate Costs application"
: "Cyflwyno cais Costau neu ddewis Ie i atodi cais Costau ar wahân";
}
}
}
data/crmfieldlookuptranslations.json
+36 -36
View File
@@ -172,8 +172,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -287,8 +287,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -402,8 +402,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -501,8 +501,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -616,8 +616,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -924,8 +924,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "Is Flooding an issue",
@@ -1039,8 +1039,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/related to CA",
@@ -1229,8 +1229,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -1328,8 +1328,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/Relates to CA",
@@ -1456,7 +1456,7 @@
},
{
"value": "Floor in Square Meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -1585,8 +1585,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -1700,8 +1700,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -1799,8 +1799,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/related to CA",
@@ -1898,8 +1898,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -2025,8 +2025,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -2453,7 +2453,7 @@
},
{
"value": "Floor Space in Square Meaters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -2567,8 +2567,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -2678,8 +2678,8 @@
"value_cy": "Datblygiad sy'n effeithio ar leoliad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/relates to CA",
@@ -2868,8 +2868,8 @@
"value_cy": "Datblygiad sy'n effeithio ar osodiad adeilad rhestredig"
},
{
"value": "Floor space in square meters",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr"
"value": "Floor space in square meters (to nearest whole number)",
"value_cy": "Arwynebedd llawr mewn metrau sgwâr (i’r rhif cyfan agosaf)"
},
{
"value": "In CA/related to CA",
data/forms/callinss77.js
+2 -1
View File
@@ -126,7 +126,8 @@ const Callinss77Form = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/commonland.js
+2 -1
View File
@@ -135,7 +135,8 @@ const CommonLandForm = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/compulsorypurchaseorders.js
+2 -1
View File
@@ -96,7 +96,8 @@ const CompulsoryPurchaseOrdersForm = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/enforcementnoticeappeals174.js
+2 -1
View File
@@ -135,7 +135,8 @@ const EnforcementNoticeAppeals174Form = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/environmentalpermitting.js
+2 -1
View File
@@ -154,7 +154,8 @@ const EnvironmentalPermittingForm = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/hedgeshedgerowstreepreservationreplacem.js
+2 -1
View File
@@ -135,7 +135,8 @@ const HedgesHedgerowsTreePreservationReplacemForm = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/householderappealhas.js
+2 -1
View File
@@ -135,7 +135,8 @@ const HouseholderAppealHasForm = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/listedbuildingandconservationareaconsen.js
+2 -1
View File
@@ -135,7 +135,8 @@ const ListedBuildingAndConservationAreaConsenForm = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/maintenanceoflands217.js
+2 -1
View File
@@ -135,7 +135,8 @@ const MaintenanceOfLands217Form = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/forms/planningappeals78.js
+2 -1
View File
@@ -148,7 +148,8 @@ const PlanningAppeals78Form = (props) => {
class="govuk-label"
for="pinswg_floorspaceinsquaremeters"
>
Floor space in square meters
Floor space in square meters (to nearest
whole number)
</label>
<input
name="pinswg_floorspaceinsquaremeters"
data/formsxml/callinss77.xml
+1 -1
View File
@@ -604,7 +604,7 @@
</row>
<row>
<labels>
<label description="Floor space in square meters" />
<label description="Floor space in square meters (to nearest whole number)" />
</labels>
<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="5" disabled="false" />
</row>
data/formsxml/commonland.xml
+1 -1
View File
@@ -370,7 +370,7 @@
</row>
<row>
<labels>
<label description="Floor space in square meters" />
<label description="Floor space in square meters (to nearest whole number)" />
</labels>
<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="5" disabled="false" />
</row>
data/formsxml/compulsorypurchaseorders.xml
+1 -1
View File
@@ -370,7 +370,7 @@
</row>
<row>
<labels>
<label description="Floor space in square meters" />
<label description="Floor space in square meters (to nearest whole number)" />
</labels>
<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="5" disabled="false" />
</row>
data/formsxml/environmentalpermitting.xml
+1 -1
View File
@@ -370,7 +370,7 @@
</row>
<row>
<labels>
<label description="Floor space in square meters" />
<label description="Floor space in square meters (to nearest whole number)" />
</labels>
<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="5" disabled="false" />
</row>
data/formsxml/hedgeshedgerowstreepreservationreplacem.xml
+1 -1
View File
@@ -370,7 +370,7 @@
</row>
<row>
<labels>
<label description="Floor space in square meters" />
<label description="Floor space in square meters (to nearest whole number)" />
</labels>
<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="5" disabled="false" />
</row>
data/formsxml/maintenanceoflands217.xml
+1 -1
View File
@@ -370,7 +370,7 @@
</row>
<row>
<labels>
<label description="Floor space in square meters" />
<label description="Floor space in square meters (to nearest whole number)" />
</labels>
<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="5" disabled="false" />
</row>
data/formsxml/planningappeals78.xml
+5 -5
View File
@@ -46,7 +46,7 @@
<labels>
<label description="Has the description of the development changed since the application was submitted?" />
</labels>
<control validation="[required]" id="pinswg_developmentdescriptionchanged" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentdescriptionchanged" disabled="false" requiredDocumentValue="Yes" requiredDocumentLabel="Description of development change confirmation" />
<control validation="[required]" id="pinswg_developmentdescriptionchanged" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentdescriptionchanged" disabled="false" requiredDocumentValue="Yes" requiredDocumentLabel="newappeal:description-of-development-change-confirmation" />
</row>
<row>
<labels>
@@ -142,7 +142,7 @@
<labels>
<label description="Ownership certificate" hint="newappeal:new-appeal-ownership-hint" />
</labels>
<control validation="[required]" id="pinswg_ownershipcertificate" classid="{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldcontent="[846040001|newappeal:new-appeal-ownership-option-A,846040002|newappeal:new-appeal-ownership-option-B,846040003|newappeal:new-appeal-ownership-option-CD]" datafieldname="pinswg_ownershipcertificate" requiredDocumentValue="Yes" requiredDocumentLabel="Relevant Ownership certificate" disabled="false" />
<control validation="[required]" id="pinswg_ownershipcertificate" classid="{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldcontent="[846040001|newappeal:new-appeal-ownership-option-A,846040002|newappeal:new-appeal-ownership-option-B,846040003|newappeal:new-appeal-ownership-option-CD]" datafieldname="pinswg_ownershipcertificate" requiredDocumentValue="Yes" requiredDocumentLabel="newappeal:relevant-ownership-certificate" disabled="false" />
</row>
<row>
<labels>
@@ -286,7 +286,7 @@
<labels>
<label description="Are you attaching a separate Statement of Case document?" />
</labels>
<control validation="[required]" id="pinswg_attachsoc" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_attachsoc" requiredDocumentValue="Yes" requiredDocumentLabel="Statement of Case" disabled="false" />
<control validation="[required]" id="pinswg_attachsoc" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_attachsoc" requiredDocumentValue="Yes" requiredDocumentLabel="newappeal:statement-of-case" disabled="false" />
</row>
<row>
<labels>
@@ -316,13 +316,13 @@
<labels>
<label description="Are you attaching a separate Costs application?" />
</labels>
<control validation="[required]" id="pinswg_attachcostapplication" parentField="pinswg_costappliedforindicator" parentFieldShowOnValue="true" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_attachcostapplication" requiredDocumentValue="Yes" requiredDocumentLabel="Cost Application" disabled="false" />
<control validation="[required]" id="pinswg_attachcostapplication" parentField="pinswg_costappliedforindicator" parentFieldShowOnValue="true" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_attachcostapplication" requiredDocumentValue="Yes" requiredDocumentLabel="newappeal:cost-application" disabled="false" />
</row>
<row>
<labels>
<label description="Do you intend to submit a planning obligation (a section 106 agreement or a unilateral undertaking) with this appeal?" />
</labels>
<control validation="[required]" id="pinswg_s106unilateralsubmitted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_s106unilateralsubmitted" requiredDocumentValue="Yes" requiredDocumentLabel="Planning obligation (S106/Unilateral)" disabled="false" />
<control validation="[required]" id="pinswg_s106unilateralsubmitted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_s106unilateralsubmitted" requiredDocumentValue="Yes" requiredDocumentLabel="newappeal:planning-obligation-(s106/unilateral)" disabled="false" />
</row>
</rows>
</section>
data/formsxml/planningconditionss73s79.xml
+1 -1
View File
@@ -601,7 +601,7 @@
</row>
<row>
<labels>
<label description="Floor space in square meters" />
<label description="Floor space in square meters (to nearest whole number)" />
</labels>
<control id="pinswg_floorspaceinsquaremeaters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeaters" disabled="false" />
</row>
locales/cy/newappeal.json
+13 -1
View File
@@ -16,6 +16,9 @@
"appeal-confirmation-label": "Cadarnhaf fy mod yn gwneud apêl yn erbyn penderfyniad i wrthod caniatâd cynllunio neu fethiant i benderfynu ar gais cynllunio o fewn 8 wythnos.",
"select-to-confirm-label": "Cadarnhewch i barhau",
"is-required-label": "Yn ofynnol",
"select-a-date-label": "Dewiswch ddyddiad",
"invalid-decimal-label": "Rhif annilys (uchafswm o 7 nod, 2 le degol)",
"invalid-number-label": "Dylai fod yn rhif",
"emojis-not-allowed-label": "Ni chaniateir emojis",
"invalid-postcode-label": "Cod post annilys",
"hascas-confirmation-label": "Cadarnhewch fod angen apêl HAS/CAS",
@@ -99,5 +102,14 @@
"new-appeal-complete-back-link": "Yn ôl i Fy Mhorth",
"new-appeal-multiline-pid": "Peidiwch â chynnwys gwybodaeth bersonol nac ariannol",
"new-appeal-statement-case-error": "Cyflwynwch eich Datganiad Achos neu dewiswch Ie i atodi Dogfen Datganiad Achos ar wahân",
"new-appeal-costs-application-error": "Cyflwyno cais Costau neu ddewis Ie i atodi cais Costau ar wahân"
"new-appeal-costs-application-error": "Cyflwyno cais Costau neu ddewis Ie i atodi cais Costau ar wahân",
"application-form": "Ffurflen gais",
"description-of-development-change-confirmation": "Disgrifiad o gadarnhad newid datblygiad",
"relevant-ownership-certificate": "Tystysgrif Perchnogaeth Berthnasol",
"statement-of-case": "Datganiad Achos",
"cost-application": "Cais Cost",
"planning-obligation-(s106/unilateral)": "Rhwymedigaeth gynllunio (S106/Unochrog)",
"site-location-plan": "Cynllun Lleoliad Safle",
"registration-of-application-letter": "Llythyr Cofrestru Cais",
"previously-added-files": "Ffeiliau a ychwanegwyd yn flaenorol"
}
locales/en/newappeal.json
+15 -2
View File
@@ -1,5 +1,6 @@
{
"viewall-link": "View all",
"viewall-link-count": "View all {{count}} cases",
"parent-page-title": "My portal",
"page-title": "New appeal",
"select-lpa-label": "Select your Local Planning Authority (LPA)",
@@ -15,6 +16,9 @@
"appeal-confirmation-label": "I confirm that I am making an appeal against a refusal of planning permission or failure to determine a planning application within 8 weeks.",
"select-to-confirm-label": "Confirm to continue",
"is-required-label": "Is required",
"select-a-date-label": "Select a date",
"invalid-decimal-label": "Invalid number (max 7 characters, 2 decimal places)",
"invalid-number-label": "Should be a number",
"emojis-not-allowed-label": "Emojis are not allowed",
"invalid-postcode-label": "Invalid postcode",
"hascas-confirmation-label": "Confirm HAS/CAS appeal is required",
@@ -81,7 +85,7 @@
"s78-appeals-only-bullet-one": "a refusal of planning permission",
"s78-appeals-only-bullet-two": "failure to determine a planning application within 8 weeks",
"s78-appeals-only-label-a": "All other appeals must be submitted by email or post.",
"new-appeal-inspector-onsite-paragraph": "NOTE: The inspector will visit the site unaccompanied by either party unless the relevant part of the site cannot be seen from a road or other public land, or it is essential for the Inspector to enter the site to check measurements or relevant facts.",
"new-appeal-inspector-onsite-paragraph": "NOTE: The Inspector will visit the site unaccompanied by either party unless the relevant part of the site cannot be seen from a road or other public land, or it is essential for the Inspector to enter the site to check measurements or relevant facts.",
"new-appeal-submission-of-case-hint": "This is your only opportunity to make your case in connection with the reason for the appeal. Therefore please provide your FULL statement of case. To do this, you need to go through the reasons for the decision (if provided), and explain why you disagree. Only the reasons within the LPA's decision and the reasons put forward by you at application stage should be included in your Statement of Case. You should not introduce any new reasons for the appeal. Please refer to our Procedural Guide for further information.",
"new-appeal-what-procedure-hint": "Appeals dealt with under Part 4 of The Town and Country Planning (Referred Applications and Appeals Procedure) (Wales) Regulations 2017 can be considered on the basis of written representation, a hearing, an inquiry or combined proceedings. In accordance with the Town and Country Planning (Determination of Procedure) (Wales) Order 2017, the Planning and Environment Decisions Wales will make a determination as to the most appropriate procedure and will review it throughout the process.",
"new-appeal-cost-application-hint": "You must submit a statement below that clearly explains why you think unreasonable behaviour has occurred and how this has caused unnecessary or wasted expense.",
@@ -98,5 +102,14 @@
"new-appeal-complete-back-link": "Back to My Portal",
"new-appeal-multiline-pid": "Do not include personal or financial information.",
"new-appeal-statement-case-error": "Submit your Statement of Case or select Yes to attach a separate Statement of Case Document",
"new-appeal-costs-application-error": "Submit a Costs application or select Yes to attach a separate Costs application"
"new-appeal-costs-application-error": "Submit a Costs application or select Yes to attach a separate Costs application",
"application-form": "Application form",
"description-of-development-change-confirmation": "Description of development change confirmation",
"relevant-ownership-certificate": "Relevant Ownership certificate",
"statement-of-case": "Statement of Case",
"cost-application": "Cost Application",
"planning-obligation-(s106/unilateral)": "Planning obligation (S106/Unilateral)",
"site-location-plan": "Site Location Plan",
"registration-of-application-letter": "Registration of Application letter",
"previously-added-files": "Previously added files"
}
pages/api/auth/[...nextauth].js
+6 -6
View File
@@ -172,12 +172,12 @@ const authOptions = (locale, req, res) => {
const personalisation = {
"emailAddress": email,
"signInLink":
locale == "cy"
? url.split("&token")[0] +
"/cy&token" +
url.split("&token")[1]
: url,
"signInLink": url,
// locale == "cy"
// ? url.split("&token")[0] +
// "/cy&token" +
// url.split("&token")[1]
// : url,
"linkExpiry": 2 * 60 * 60,
};
pages/myportal/[appealtypes].js
+4 -1
View File
@@ -44,7 +44,7 @@ import {
setAwaitingSubmissionDetails,
setAwaitingSubmissionFromBlob,
} from "../../store/awaitingSubmission/action";
import { setCurrentView } from "../../store/currentView/action";
import { setCurrentView, setLocale } from "../../store/currentView/action";
import { setForm } from "../../store/formData/action";
import { wrapper } from "../../store/store";
import ServiceBanner from "../../components/myportal/servicebanner";
@@ -238,6 +238,9 @@ export const getServerSideProps = wrapper.getServerSideProps(
};
}
console.log(ctx.locale);
store.dispatch(setLocale(ctx.locale));
let loggedInUserIdent = thisSession.user.id;
let loggedInUserEmail = thisSession.user.email;
pages/myportal/index.js
+3 -1
View File
@@ -34,7 +34,7 @@ import {
setAwaitingSubmissionDetails,
setAwaitingSubmissionFromBlob,
} from "../../store/awaitingSubmission/action";
import { setShowReps } from "../../store/currentView/action";
import { setShowReps, setLocale } from "../../store/currentView/action";
import { setMyCases, setMyCasesDetails } from "../../store/myCases/action";
import {
setMyRepresentations,
@@ -260,6 +260,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
console.log("req locale :", ctx.locale);
store.dispatch(setLocale(ctx.locale));
const preferredLocale =
accountDetails.pinswg_preferredlanguage == "846040000"
? "cy"
store/currentView/action.js
+8
View File
@@ -11,6 +11,7 @@ export const currentViewActionTypes = {
SETREPRESENTATIONMESSAGESENT: "SETREPRESENTATIONMESSAGESENT",
SETREPRESENTATIONRESET: "SETREPRESENTATIONRESET",
SETSHOWLOGIN: "SETSHOWLOGIN",
SETLOCALE: "SETLOCALE",
};
export const getCurrentViewObj = () => (dispatch) => {
@@ -102,3 +103,10 @@ export const setShowReps = (showReps, showLogin) => (dispatch) => {
showReps: showReps,
});
};
export const setLocale = (locale) => (dispatch) => {
return dispatch({
type: currentViewActionTypes.SETLOCALE,
locale: locale,
});
};
store/currentView/reducer.js
+6
View File
@@ -11,6 +11,7 @@ const currentViewInitialState = {
currentPage: 1,
showReps: false,
showLogin: false,
locale: "",
};
export default function reducer(state = currentViewInitialState, action) {
@@ -72,6 +73,11 @@ export default function reducer(state = currentViewInitialState, action) {
showReps: action.showReps,
showLogin: action.showLogin,
};
case currentViewActionTypes.SETLOCALE:
return {
...state,
locale: action.locale,
};
default:
return state;
}