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

apply GEL to reps

Browse Source
This commit is contained in:
robbond
2024-10-01 13:51:36 +01:00
parent 589577fb45
commit 062d8e8cb5
15 changed files with 484 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/breadcrumbs.js
+36 -4
View File
@@ -7,11 +7,20 @@ import { connect } from "react-redux";
import { useSession } from "next-auth/react";
import { setCurrentView } from "../store/currentView/action";
import { Field, change, reduxForm } from "redux-form";
import { setCurrentSection } from "../store/appealType/action";
import {
setRepresentationCapacity,
setRepresentationSubmit,
} from "../store/currentView/action";
const Breadcrumbs = (props) => {
const { currentView, setCurrentView, setCurrentSection } = props;
const {
currentView,
setCurrentView,
setCurrentSection,
setRepresentationCapacity,
} = props;
const router = useRouter();
let { t } = useTranslation();
@@ -28,7 +37,8 @@ const Breadcrumbs = (props) => {
<ol className="govuk-breadcrumbs__list">
{router.pathname != "/myportal/[appealtypes]" &&
router.pathname != "/newappeal" &&
router.pathname != "/newappeal/[appealtypes]" && (
router.pathname != "/newappeal/[appealtypes]" &&
router.pathname != "/myportal/representation" && (
<li className="govuk-breadcrumbs__list-item">
<Link
href={"/"}
@@ -731,7 +741,7 @@ const Breadcrumbs = (props) => {
)}
{router.pathname == "/myportal/representation" && (
<>
{session != null && (
{/* {session != null && (
<li className="govuk-breadcrumbs__list-item">
<Link
href={
@@ -777,6 +787,22 @@ const Breadcrumbs = (props) => {
props.props.currentView.caseReference
.currentReference
}
</li> */}
<li className="govuk-breadcrumbs__link-item">
<a
className="govuk-breadcrumbs__link"
href="#"
onClick={() => {
setRepresentationCapacity();
props.updateField(
"representationForm",
"representationType",
""
);
}}
>
{t("common:back-link")}
</a>
</li>
</>
)}
@@ -1006,6 +1032,12 @@ const mapStateToProps = (state) => {
const mapDispatchToProps = (dispatch) => {
return {
updateField: (form, field, newValue) =>
dispatch(change(form, field, newValue)),
setRepresentationCapacity: (representationCapacity) => {
//dispatch(reset("representationForm"));
dispatch(setRepresentationCapacity(representationCapacity));
},
setCurrentView: (currentView) => {
dispatch(setCurrentView(currentView));
},
components/case/representation/index.js
+5 -3
View File
@@ -1004,9 +1004,10 @@ let MakeRepresentation = (props) => {
</h1>
{currentView.caseReference.caseReference}
<div id="rep-form">
<div className="govuk-grid-column-three-quarters">
<div className="govuk-grid-column-three-quarters wgForm">
{whichControl()}
</div>
<div className="govuk-grid-column-one-quarter">
{" "}
<div className="card">
@@ -1073,7 +1074,7 @@ let MakeRepresentation = (props) => {
</div>
</div>
</div>{" "}
{typeof props.props.currentView
{/* {typeof props.props.currentView
.representationCapacity !=
"undefined" &&
props.props.currentView
@@ -1134,8 +1135,9 @@ let MakeRepresentation = (props) => {
)}
</button>
)}
ee
</div>
)}
)} */}
<div>
{formObj.hasOwnProperty(
"representationForm"
components/case/representation/representationAgent.js
+46 -2
View File
@@ -2,6 +2,8 @@ import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import { connect } from "react-redux";
import { Field, change, reduxForm } from "redux-form";
import { useState } from "react";
import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
import {
FileUploadField,
@@ -26,6 +28,8 @@ const RepAgent = (props) => {
setRepFileName,
} = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
setRepFileName(formObj.representationForm.values);
const files = acceptedFiles.map((file) => (
@@ -98,7 +102,9 @@ const RepAgent = (props) => {
options={["Yes", "No"]}
id="representationOnBehalfOf"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderCondtionalRadioList}
validate={[required]}
legend={
@@ -211,7 +217,7 @@ const RepAgent = (props) => {
>
{t("common:continue-button")}
</button>
{router.query.state != "edit" && (
{/* {router.query.state != "edit" && (
<a
onClick={() => {
setRepresentationCapacity();
@@ -225,6 +231,44 @@ const RepAgent = (props) => {
>
{t("common:back-link")}
</a>
)} */}
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale == "cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.form[props.form].values ||
{};
console.log("valuesobj:", valuesObj);
delete valuesObj["_pinswg_appellant_value"];
console.log("on save:", valuesObj);
updateRepresentation(
valuesObj,
false,
true
);
}}
>
{t("common:save-exit-button")}
</button>
)}
</div>
</div>
components/case/representation/representationAppellant.js
+42 -2
View File
@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
import React from "react";
import { connect } from "react-redux";
import { Field, change, reduxForm } from "redux-form";
import { useState } from "react";
import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
import {
@@ -31,6 +32,7 @@ const RepAppellant = (props) => {
setRepFileName,
} = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
setRepFileName(formObj.representationForm.values);
@@ -53,7 +55,6 @@ const RepAppellant = (props) => {
>
{t("myrepresentations:kind-of-rep-label")}
</label>
<Field
name="representationType"
component={RenderPickList}
@@ -193,7 +194,7 @@ const RepAppellant = (props) => {
>
{t("common:continue-button")}
</button>
{router.query.state != "edit" && (
{/* {router.query.state != "edit" && (
<a
onClick={() => {
setRepresentationCapacity();
@@ -207,6 +208,45 @@ const RepAppellant = (props) => {
>
{t("common:back-link")}
</a>
)} */}
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale == "cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.form[props.form].values ||
{};
console.log("valuesobj:", valuesObj);
delete valuesObj["_pinswg_appellant_value"];
console.log("on save:", valuesObj);
updateRepresentation(
valuesObj,
false,
true
);
}}
>
{t("common:save-exit-button")}
</button>
)}
</div>
</div>
components/case/representation/representationCapacitySelection.js
+3 -1
View File
@@ -56,7 +56,9 @@ let RepCapacitySelection = (props) => {
options={capacityOptionsArr}
id="representationCapacity"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderRadioListWithText}
validate={[required]}
/>
components/case/representation/representationElements.js
+24 -30
View File
@@ -155,7 +155,7 @@ export const RenderRadioListWithText = ({
className={
custom.inline == true
? "govuk-radios govuk-radios--inline govuk-radios--small "
: "govuk-radios govuk-radios--small govuk-grid-column-full"
: "govuk-radios govuk-radios--small govuk-grid-column-full conditionalText"
}
>
{Object.keys(options).map((key, index) => (
@@ -164,39 +164,28 @@ export const RenderRadioListWithText = ({
data-children-count={key}
key={key}
>
<Field
id={id + "_" + index}
name={id}
component="input"
type="radio"
className="govuk-radios__input"
value={options[key]}
/>
<label
className="govuk-label govuk-radios__label"
htmlFor={id + "_" + index}
>
{options[key]}
</label>
<div className="govuk-grid-column-full conditionalElement">
<Field
id={id + "_" + index}
name={id}
component="input"
type="radio"
className="govuk-radios__input"
value={options[key]}
/>
<label
className="govuk-label govuk-radios__label"
htmlFor={id + "_" + index}
>
{options[key]}
</label>
</div>
{value === options[key] && (
<div
className="govuk-radios__conditional "
id={"conditional_" + id + "_" + index}
>
<div className="govuk-form-group">
<label
className="govuk-label"
htmlFor={
"conditional_" +
id +
"_Comments"
}
>
{router.locale == "en"
? "Please give further details for this selection"
: "Rhowch fanylion pellach am y dewis hwn"}
</label>
<Field
name={
"conditional_" +
@@ -208,6 +197,11 @@ export const RenderRadioListWithText = ({
id +
"_Comments"
}
label={
router.locale == "en"
? "Please give further details for this selection"
: "Rhowch fanylion pellach am y dewis hwn"
}
component={RenderRichMultiline}
type="text"
rows="5"
@@ -1041,13 +1035,13 @@ export const RenderFileUpload = (field) => {
<input id={field.id} {...getInputProps()} />
<div>
{t(
"newappeal:new-appeal-fileupload-drop-label"
"myrepresentations:fileupload-drop-label"
)}
</div>
<em>
(
{t(
"newappeal:new-appeal-fileupload-file-list-label"
"myrepresentations:fileupload-file-list-label"
)}
)
</em>
components/case/representation/representationInterestedPartyPerson.js
+49 -4
View File
@@ -3,6 +3,8 @@ import { useRouter } from "next/router";
import { useDropzone } from "react-dropzone";
import { connect } from "react-redux";
import { Field, change, reduxForm } from "redux-form";
import { useState } from "react";
import {
FileUploadField,
RenderCondtionalRadioList,
@@ -25,6 +27,7 @@ const RepInterestedPartyPerson = (props) => {
const required = (value) => (value ? undefined : "Required");
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
setRepFileName(formObj.representationForm.values);
@@ -60,7 +63,9 @@ const RepInterestedPartyPerson = (props) => {
datafieldname="representationType"
validate={[required]}
optionsArr={interestedPersonRepresentationArr}
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
/>
</>
) : (
@@ -98,7 +103,9 @@ const RepInterestedPartyPerson = (props) => {
options={["Yes", "No"]}
id="representationOnBehalfOf"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderCondtionalRadioList}
validate={[required]}
legend={
@@ -172,7 +179,7 @@ const RepInterestedPartyPerson = (props) => {
>
{t("common:continue-button")}
</button>
{/*
<a
onClick={() => {
setRepresentationCapacity();
@@ -190,7 +197,45 @@ const RepInterestedPartyPerson = (props) => {
className="govuk-link"
>
{t("case:summary-back-button-label")}
</a>
</a> */}
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale == "cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.form[props.form].values ||
{};
console.log("valuesobj:", valuesObj);
delete valuesObj["_pinswg_appellant_value"];
console.log("on save:", valuesObj);
updateRepresentation(
valuesObj,
false,
true
);
}}
>
{t("common:save-exit-button")}
</button>
)}
</div>
</div>
)}
components/case/representation/representationLPA.js
+94 -2
View File
@@ -5,6 +5,8 @@ import { useRouter } from "next/router";
import { useDropzone } from "react-dropzone";
import { connect } from "react-redux";
import { Field, change, formValueSelector, reduxForm } from "redux-form";
import { useState } from "react";
import {
FileUploadField,
RenderMultiline,
@@ -38,6 +40,8 @@ let RepLPA = (props) => {
updateRepresentation,
} = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
const files = acceptedFiles.map((file) => (
<li key={file.path}>
{file.path} - {file.size} bytes
@@ -405,6 +409,51 @@ let RepLPA = (props) => {
Back
</a>
)}
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale == "cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.props.form[
props.form
].values || {};
console.log(
"valuesobj:",
valuesObj
);
delete valuesObj[
"_pinswg_appellant_value"
];
console.log("on save:", valuesObj);
updateRepresentation(
valuesObj,
false,
true
);
}}
>
{t("common:save-exit-button")}
</button>
)}
</>
)}{" "}
{(typeof props.representationType != "undefined" ||
@@ -418,7 +467,7 @@ let RepLPA = (props) => {
>
{t("common:continue-button")}
</button>
{router.query.state != "edit" && (
{/* {router.query.state != "edit" && (
<a
onClick={() => {
//setRepresentationCapacity();
@@ -430,8 +479,51 @@ let RepLPA = (props) => {
}}
className="govuk-link"
>
{t("common:back-link")}
{t("common:back-link")}www
</a>
)} */}
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale == "cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.form[props.form]
.values || {};
console.log(
"valuesobj:",
valuesObj
);
delete valuesObj[
"_pinswg_appellant_value"
];
console.log("on save:", valuesObj);
updateRepresentation(
valuesObj,
false,
true
);
}}
>
{t("common:save-exit-button")}
</button>
)}
</>
)}
components/case/representation/representationLPACapacitySelection.js
+1 -1
View File
@@ -54,7 +54,7 @@ let RepLPACapacitySelection = (props) => {
id="representationCapacity"
//className="govuk-radios__input "
errorMsg={t(
"newappeal:select-an-option-label"
"myrepresentations:select-an-option-label"
)}
component="input"
validate={[required]}
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+84 -28
View File
@@ -176,7 +176,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="enterNeighbouringLandToViewSite"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -203,7 +205,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="enterNeighbouringLandAccessRequired"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -230,7 +234,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="healthAndSafetyIssues"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -305,7 +311,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="feeExempt"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -340,7 +348,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="previousGrantedCerts"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -365,7 +375,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="stopNoticeServed"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -390,7 +402,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="relatedCases"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -415,7 +429,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="previousEnforcement"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -440,7 +456,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="subjectArticle4"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -465,7 +483,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="previousPDRRestriction"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -584,7 +604,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="ROW"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -609,7 +631,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="conservationArea"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -634,7 +658,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="affectListedBuilding"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -659,7 +685,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="TPO"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -684,7 +712,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="natureConservationSite"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -709,7 +739,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="protectedSpecies"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -753,7 +785,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="floodingIssue"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -778,7 +812,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="governmentDepartmentComments"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -817,7 +853,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="developmentCarriedOutInAccordance"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -870,7 +908,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="developmentAnyOtherConditions"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -906,7 +946,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="copyOfEnforcementNotice"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -931,7 +973,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="enforcementNoticePlan"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -956,7 +1000,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="listOfNotifiedOfEnforcement"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -981,7 +1027,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="copyOfLetterOfAppealNotification"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -1006,7 +1054,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="lpaEIAOS"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -1031,7 +1081,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="detailsOfOtherAppeals"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -1056,7 +1108,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="detailsOfPreviousAppeals"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -1081,7 +1135,9 @@ let Enforcement_Questionnaire = (props) => {
]}
id="otherRelevantInformation"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+60 -20
View File
@@ -209,7 +209,9 @@ let S78_Questionnaire = (props) => {
]}
id="enterNeighbouringLandToViewSite"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -236,7 +238,9 @@ let S78_Questionnaire = (props) => {
]}
id="enterNeighbouringLandAccessRequired"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -263,7 +267,9 @@ let S78_Questionnaire = (props) => {
]}
id="healthAndSafetyIssues"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -427,7 +433,9 @@ let S78_Questionnaire = (props) => {
]}
id="ROW"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -452,7 +460,9 @@ let S78_Questionnaire = (props) => {
]}
id="conservationArea"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -477,7 +487,9 @@ let S78_Questionnaire = (props) => {
]}
id="affectListedBuilding"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -502,7 +514,9 @@ let S78_Questionnaire = (props) => {
]}
id="TPO"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -527,7 +541,9 @@ let S78_Questionnaire = (props) => {
]}
id="natureConservationSite"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -552,7 +568,9 @@ let S78_Questionnaire = (props) => {
]}
id="protectedSpecies"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -594,7 +612,9 @@ let S78_Questionnaire = (props) => {
]}
id="governmentDepartmentComments"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -650,7 +670,9 @@ let S78_Questionnaire = (props) => {
]}
id="developmentCarriedOutInAccordance"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -705,7 +727,9 @@ let S78_Questionnaire = (props) => {
]}
id="developmentAnyOtherConditions"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={
@@ -741,7 +765,9 @@ let S78_Questionnaire = (props) => {
]}
id="copyOfApplicantsCertificate"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -765,7 +791,9 @@ let S78_Questionnaire = (props) => {
]}
id="advertismentGiven"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -789,7 +817,9 @@ let S78_Questionnaire = (props) => {
]}
id="copyOfLetterOfAppealNotification"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -813,7 +843,9 @@ let S78_Questionnaire = (props) => {
]}
id="lpaEIAOS"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -837,7 +869,9 @@ let S78_Questionnaire = (props) => {
]}
id="advertismentConsentDiscontinuanceNotice"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -861,7 +895,9 @@ let S78_Questionnaire = (props) => {
]}
id="detailsOfOtherAppeals"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -885,7 +921,9 @@ let S78_Questionnaire = (props) => {
]}
id="detailsOfPreviousAppeals"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
@@ -909,7 +947,9 @@ let S78_Questionnaire = (props) => {
]}
id="otherRelevantInformation"
className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")}
errorMsg={t(
"myrepresentations:select-an-option-label"
)}
component={RenderLPACondtionalRadioList}
validate={[required]}
legend={t(
components/myportal/servicebanner.js
+5 -3
View File
@@ -22,9 +22,10 @@ const ServiceBanner = (props) => {
console.info("////////////\n" + "logout" + "\n////////////");
window.localStorage.clear(),
destroyCookie(null, "next-auth.csrf-token"),
destroyCookie(null, "next-auth.callback-url"),
destroyCookie(null, "pedw_locale"),
destroyCookie(null, "pinsUser"),
{ path: "/" },
destroyCookie(null, "next-auth.callback-url", { path: "/" }),
destroyCookie(null, "pedw_locale", { path: "/" }),
destroyCookie(null, "pinsUser", { path: "/" }),
signOut({ callbackUrl: "/logout" });
};
@@ -32,6 +33,7 @@ const ServiceBanner = (props) => {
"/myportal/[appealtypes]",
"/newappeal",
"/newappeal/[appealtypes]",
"/myportal/representation",
];
return (
<div className="servicebanner myportal govuk-!-margin-bottom-4">
locales/cy/myrepresentations.json
+4 -1
View File
@@ -19,6 +19,8 @@
"publish-policy-label": "Sylwch y gall yr holl sylwadau gael eu cyhoeddi yn unol â'n Polisi Cyhoeddi. Os bydd eich sylw yn cynnwys unrhyw wybodaeth sensitif neu wybodaeth a allai fod yn ddifenwol, efallai y caiff ei olygu cyn ei gyhoeddi. Os yw'n cynnwys cynnwys hiliol, enllibus neu sarhaus caiff ei ddychwelyd atoch a gofynnir i chi ddarparu fersiwn ddiwygiedig.",
"questionnaire-publish-policy-label": "Sylwch y gall holl ddogfennau holiadur gael eu cyhoeddi yn unol â'n Polisi Cyhoeddi. Os bydd eich holiadur yn cynnwys unrhyw wybodaeth sensitif neu wybodaeth a allai fod yn ddifenwol, efallai y caiff ei olygu cyn ei gyhoeddi",
"add-files-label": "Ychwanegwch eich ffeiliau",
"fileupload-drop-label": "Llusgwch a gollwng eich ffeiliau yma.",
"fileupload-file-list-label": "Dim ond ffeiliau .pdf, .doc, .docx, .tif, .tiff, .jpeg, .jpg neu .zip a dderbynnir",
"capacity-para-one": "Mae'r ffurflen hon yn eich galluogi i gyflwyno sylwadau ar achos i Benderfyniadau Cynllunio ac Amgylchedd Cymru.",
"capacity-para-two": "Sylwch fod angen gwneud sylwadau gan bartïon â diddordeb o fewn yr amserlen. Mae hwn i'w weld ar y \"Crynodeb Achos\" tudalen. Gall sylwadau a gyflwynir ar ôl y dyddiad hwn gael eu hystyried yn annilys.",
"capacity-select-your-details": "Eich manylion",
@@ -215,5 +217,6 @@
"statement-date-label": "Dyddiad",
"statement-onbehalf-label": "Ar ran",
"final-comments-label": "Sylwadau terfynol",
"representation-type": "Math o gynrychiolaeth"
"representation-type": "Math o gynrychiolaeth",
"select-an-option-label": "Dewiswch opsiwn"
}
locales/en/myrepresentations.json
+4 -1
View File
@@ -19,6 +19,8 @@
"publish-policy-label": "Please note that all representations may be published in line with our Publishing Policy. Should your representation include any sensitive information or potentially defamatory information, it may be redacted before publishing. If it contains racist, libellous or offensive content it will be returned to you and you will be asked to provide an amended version.",
"questionnaire-publish-policy-label": "Please note that all questionnaire documents may be published in line with our Publishing Policy. Should your questionnaire include any sensitive information or potentially defamatory information, it may be redacted before publishing",
"add-files-label": "Add your files",
"fileupload-drop-label": "Drag and drop your files here.",
"fileupload-file-list-label": "Only .pdf, .doc, .docx, .tif, .tiff, .jpeg, .jpg or .zip files will be accepted",
"capacity-para-one": "This form enables you to submit comments on a case to Planning and Environment Decisions Wales.",
"capacity-para-two": "Please note that comments from interested parties need to be made within the timetable. This can be found on the previous \"Case Summary\" page. Comments submitted after this date may be considered invalid.",
"capacity-select-your-details": "Your details",
@@ -216,5 +218,6 @@
"statement-date-label": "Date",
"statement-onbehalf-label": "On behalf of",
"final-comments-label": "Final comments",
"representation-type": "Representation type"
"representation-type": "Representation type",
"select-an-option-label": "Select an option"
}
styles/sass/welshgov/_application.scss
+27 -1
View File
@@ -415,6 +415,21 @@ a.longLinkBreak {
padding-left: 0px !important;
}
.conditionalElement {
display: flex;
}
.conditionalText {
.govuk-radios__item.govuk-grid-column-full {
display: flex;
flex-direction: column;
}
.govuk-label {
padding-left: 0px;
}
}
.govuk-radios--small .govuk-radios__item:hover .govuk-radios__input:not(:disabled)+.govuk-radios__label:before {
box-shadow: 0 0 0 5px $lightgrey;
}
@@ -434,8 +449,9 @@ a.longLinkBreak {
label {
margin-top: 0px;
background-color: $lightgrey_semi;
// background-color: $lightgrey_semi;
padding: 20px 20px 20px 50px;
width: 100%;
&:before {
top: 18px;
@@ -470,6 +486,16 @@ a.longLinkBreak {
}
}
#rep-form .wgForm {
margin-left: 0;
@media screen and (max-width: 900px) {
width: 100%;
}
width:75%
}
.newAppealForm {
background: $lightgrey_offwhite;
padding: 20px;