Merged PR 866: Has/cas adverts & lbc appeal updates

Related work items: #7616, #7617, #7629, #7630
This commit is contained in:
Robert Bond
2022-06-15 14:37:29 +00:00
13 changed files with 573 additions and 193 deletions
@@ -61,7 +61,7 @@ let RepCapacitySelection = (props) => {
options={capacityOptionsArr}
id="representationCapacity"
className="govuk-radios__input"
errorMsg="Select an option"
errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadioList}
validate={[required]}
/>
+133 -40
View File
@@ -108,7 +108,7 @@ export function Textfield(props) {
// console.log(parentField, showIfHasParentShowValue);
// console.log(parentField, formProps, form);
//console.log("validation props:", validation);
console.log("validation props:", validation);
return (
<div className="govuk-form-group">
@@ -621,6 +621,7 @@ const RenderYesNo = ({
export function YesNofield(props) {
const router = useRouter();
let { t } = useTranslation();
const { name, label, inline, validation } = props;
const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
@@ -635,7 +636,7 @@ export function YesNofield(props) {
id={props.name}
className={"govuk-radios__input"}
validate={eval(validation)}
errorMsg="Select an option"
errorMsg={t("newappeal:select-an-option-label")}
component={RenderYesNo}
inline={_.has(props, "inline") ? props.inline : "true"}
requiredDocumentLabel={props.requiredDocumentLabel}
@@ -773,6 +774,7 @@ export function Radiofield(props) {
const router = useRouter();
const required = (value) => (value ? undefined : "Required");
// console.log(props.options);
let { t } = useTranslation();
const fieldOptions = props.options
.slice(1, props.options.length - 1)
@@ -807,7 +809,7 @@ export function Radiofield(props) {
options={fieldOptions}
id={name}
//validate={[required]}
errorMsg="Select an option"
errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadio}
inline={props.inline}
hint={props.hint}
@@ -826,7 +828,7 @@ export function Radiofield(props) {
options={fieldOptions}
id={name}
//validate={[required]}
errorMsg="Select an option"
errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadio}
inline={props.inline}
hint={props.hint}
@@ -930,7 +932,7 @@ export function CheckBoxfield(props) {
id={props.id}
className={props.className}
//validate={[required]}
errorMsg="Select an option"
errorMsg={t("newappeal:select-an-option-label")}
component={RenderCheckBox}
/>
);
@@ -996,51 +998,142 @@ export function PickList(props) {
}
export function NumericField(props) {
const { name, label, validation } = props;
const {
name,
label,
validation,
form,
formProps,
parentFieldShowOnValue,
parentField,
} = props;
const required = (value) => (value ? undefined : "Required");
//parentFieldShowOnValue
var showIfHasParentShowValue =
parentField != false &&
!_.isEmpty(formProps[form]) &&
_.has(formProps[form].values, parentField) &&
parentFieldShowOnValue.indexOf(
formProps[form].values[parentField].toString()
) > -1;
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
console.log("parentField:", parentField, showIfHasParentShowValue);
return (
<div className="govuk-form-group">
<Field
name={props.name}
id={props.name}
type="number"
className="govuk-input govuk-input--width-20"
spellCheck="false"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={label}
/>
</div>
<>
{parentField != false ? (
showIfHasParentShowValue && (
<div className="govuk-form-group">
<Field
name={props.name}
id={props.name}
type="number"
className="govuk-input govuk-input--width-20"
spellCheck="false"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={label}
/>
</div>
)
) : (
<div className="govuk-form-group">
<Field
name={props.name}
id={props.name}
type="number"
className="govuk-input govuk-input--width-20"
spellCheck="false"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={label}
/>
</div>
)}
</>
);
}
export function DecimalField(props) {
const { name, label, validation } = props;
const {
name,
label,
validation,
form,
formProps,
parentFieldShowOnValue,
parentField,
} = props;
const required = (value) => (value ? undefined : "Required");
//parentFieldShowOnValue
var showIfHasParentShowValue =
parentField != false &&
!_.isEmpty(formProps[form]) &&
_.has(formProps[form].values, parentField) &&
parentFieldShowOnValue.indexOf(
formProps[form].values[parentField].toString()
) > -1;
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
console.log("parentField:", parentField, showIfHasParentShowValue);
return (
<div className="govuk-form-group">
<Field
name={props.name}
id={props.name}
// component="input"
type="number"
className="govuk-input govuk-input--width-10"
spellCheck="false"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={props.label}
/>
</div>
<>
{parentField != false ? (
showIfHasParentShowValue && (
<div className="govuk-form-group">
<Field
name={props.name}
id={props.name}
// component="input"
type="number"
className="govuk-input govuk-input--width-10"
spellCheck="false"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={props.label}
/>
</div>
)
) : (
<div className="govuk-form-group">
<Field
name={props.name}
id={props.name}
// component="input"
type="number"
className="govuk-input govuk-input--width-10"
spellCheck="false"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={props.label}
/>
</div>
)}
</>
);
}
+11 -10
View File
@@ -209,16 +209,17 @@ const TopThree = (props) => {
</a>
</Link>
</div>
{(topThreeType == "awaitingSubmission" ||
topThreeType == "watchedCases") && (
<div>
{
showTopThreeArr[key][
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
]
}
</div>
)}
{/* {(topThreeType == "awaitingSubmission" ||
topThreeType == "watchedCases") && ( */}
<div>
<b>Appeal type:</b>{" "}
{
showTopThreeArr[key][
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
]
}
</div>
{/* )} */}
{/* {topThreeType != "awaitingSubmission" ? ( */}
<div className="carModuleAddress">
<b>{t("myportal:case-address")}:</b>{" "}
+17 -14
View File
@@ -239,6 +239,8 @@ let AboutYou = (props) => {
...custom
}) => {
let { t } = useTranslation();
const required = (value) => (value ? undefined : "Required");
return (
<>
<div
@@ -298,6 +300,7 @@ let AboutYou = (props) => {
type="radio"
className="govuk-radios__input"
value={options[key].split("|")[0]}
validate={[required]}
// checked={
// value ==
// parseInt(options[key].split("|")[0])
@@ -393,12 +396,12 @@ let AboutYou = (props) => {
label={label}
options={fieldOptions}
id={name}
//validate={[required]}
errorMsg="Select an option"
validate={[required]}
errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadio}
inline={props.inline}
hint={props.hint}
validate={eval(validation)}
//validate={eval(validation)}
requiredDocumentLabel={props.requiredDocumentLabel}
requiredDocumentValue={props.requiredDocumentValue}
setDocumentsList={props.setDocumentsList}
@@ -412,12 +415,12 @@ let AboutYou = (props) => {
label={label}
options={fieldOptions}
id={name}
//validate={[required]}
errorMsg="Select an option"
validate={[required]}
errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadio}
inline={props.inline}
hint={props.hint}
validate={eval(validation)}
//validate={eval(validation)}
requiredDocumentLabel={props.requiredDocumentLabel}
requiredDocumentValue={props.requiredDocumentValue}
setDocumentsList={props.setDocumentsList}
@@ -504,8 +507,8 @@ let AboutYou = (props) => {
options="[846040000|newappeal:about-you-who-are-you-label-appellant,846040001|newappeal:about-you-who-are-you-label-agent]"
id={"pinswg_appellantagent"}
className="govuk-radios__input"
//validate={[required]}
errorMsg="Select an option"
validate={"[required]"}
errorMsg={t("newappeal:select-an-option-label")}
/>
{appellantAgentValue == "846040000" && (
@@ -579,8 +582,8 @@ let AboutYou = (props) => {
options="[846040000|newappeal:about-you-agent-contact-preferences-value-email,846040001|newappeal:about-you-agent-contact-preferences-value-post]"
id={"pinswg_contactprefs"}
className="govuk-radios__input"
validate={[required]}
errorMsg="Select an option"
validate={"[required]"}
errorMsg={t("newappeal:select-an-option-label")}
/>
<Radiofield
name={"pinswg_languagepreference"}
@@ -591,8 +594,8 @@ let AboutYou = (props) => {
options="[846040000|newappeal:about-you-agent-language-preferences-value-english,846040001|newappeal:about-you-agent-language-preferences-value-welsh]"
id={"pinswg_languagepreference"}
className="govuk-radios__input"
validate={[required]}
errorMsg="Select an option"
validate={"[required]"}
errorMsg={t("newappeal:select-an-option-label")}
/>
</>
)}
@@ -737,7 +740,7 @@ let AboutYou = (props) => {
id={"pinswg_contactprefs"}
className="govuk-radios__input"
validate={[required]}
errorMsg="Select an option"
errorMsg={t("newappeal:select-an-option-label")}
/>
<Radiofield
name={"pinswg_languagepreference"}
@@ -749,7 +752,7 @@ let AboutYou = (props) => {
id={"pinswg_languagepreference"}
className="govuk-radios__input"
validate={[required]}
errorMsg="Select an option"
errorMsg={t("newappeal:select-an-option-label")}
/>
</>
)}
+8
View File
@@ -149,7 +149,11 @@ export default function BuildField(props) {
<NumericField
name={props.datafieldname}
label={props.label}
form={props.props.props.form}
formProps={props.props.props.props.form}
validation={props.validation}
parentField={props.parentField}
parentFieldShowOnValue={props.parentFieldShowOnValue}
/>
);
break;
@@ -158,7 +162,11 @@ export default function BuildField(props) {
<DecimalField
name={props.datafieldname}
label={props.label}
form={props.props.props.form}
formProps={props.props.props.props.form}
validation={props.validation}
parentField={props.parentField}
parentFieldShowOnValue={props.parentFieldShowOnValue}
/>
);
break;
+262 -6
View File
@@ -15,6 +15,7 @@ import { getFormCollectionByID } from "../utils";
import FileUpload from "./fileupload";
import Aboutyou from "./aboutyou";
import { createNewCase } from "../../actions";
import { FieldsTranslations } from "../elements";
let CreateCase = (props) => {
// useEffect(() => {
@@ -26,7 +27,7 @@ let CreateCase = (props) => {
const router = useRouter();
const { locale } = router;
const { LPAData, onSubmit, handleSubmit } = props;
const { LPAData, onSubmit, handleSubmit, formData } = props;
const appealOptionsObj = _.isEmpty(props)
? [{}]
@@ -209,6 +210,207 @@ let CreateCase = (props) => {
);
};
const RenderRadio = ({
datafieldname,
name,
label,
id,
errorMsg,
options,
input: { onChange, value },
meta: { touched, error },
...custom
}) => {
let { t } = useTranslation();
const required = (value) => (value ? undefined : "Required");
return (
<>
<div
className={
touched && error
? "govuk-form-group govuk-form-group--error"
: "govuk-form-group "
}
>
<fieldset
className="govuk-fieldset"
aria-describedby={datafieldname + "-hint"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
className="govuk-fieldset__heading govuk-body-m"
id={id + "_label"}
>
{label}
</label>
</legend>
{touched && error && (
<span
id={id + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
Error:
</span>{" "}
{errorMsg}
</span>
)}
<div
className={
custom.inline == false
? "govuk-radios govuk-radios--small"
: "govuk-radios govuk-radios--inline govuk-radios--small"
}
>
{" "}
{custom.hint != undefined && (
<div className="govuk-hint">{custom.hint}</div>
)}
{Object.keys(options).map((key, index) => (
<div
className="govuk-radios__item"
data-children-count={key}
key={key}
>
<Field
id={id + "_" + index}
name={id}
component="input"
type="radio"
hint={custom.hint}
className="govuk-radios__input"
value={options[key].split("|")[0]}
validate={[required]}
// checked={
// value ==
// parseInt(options[key].split("|")[0])
// }
onChange={(e) => {
let docListObj =
custom.documentList;
if (
custom.requiredDocumentValue ==
"Yes"
) {
e.target.value != "846040000"
? (docListObj =
Object.assign(
docListObj,
{
["documentCheckList_" +
id]:
custom.requiredDocumentLabel,
}
))
: delete docListObj[
"documentCheckList_" +
id
];
custom.setDocumentsList(
docListObj
);
}
}}
/>
<label
className="govuk-label govuk-radios__label"
htmlFor={id + "_" + index}
>
{t(options[key].split("|")[1])}
</label>
</div>
))}
</div>
</fieldset>
</div>
</>
);
};
function Radiofield(props) {
const {
name,
label,
datafieldname,
parentField,
form,
formProps,
parentFieldShowOnValue,
validation,
} = props;
const router = useRouter();
const required = (value) => (value ? undefined : "Required");
// console.log(props.options);
const fieldOptions = props.options
.slice(1, props.options.length - 1)
.split(",");
//parentFieldShowOnValue
var showIfHasParentShowValue = parentField != false;
//debugger;
// parentField != false &&
// !_.isEmpty(formProps[form]) &&
// _.has(formProps[form].values, parentField) &&
// parentFieldShowOnValue.indexOf(
// formProps[form].values[parentField].toString()
// ) > -1;
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
// console.log(
// datafieldname,
// showIfHasParentShowValue,
// formProps[form].values[parentField]
// );
return (
<>
{parentField != false ? (
showIfHasParentShowValue && (
<Field
name={name}
datafieldname={datafieldname}
label={label}
options={fieldOptions}
id={name}
validate={[required]}
errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadio}
inline={props.inline}
hint={props.hint}
//validate={eval(validation)}
requiredDocumentLabel={props.requiredDocumentLabel}
requiredDocumentValue={props.requiredDocumentValue}
setDocumentsList={props.setDocumentsList}
documentList={props.documentList}
/>
)
) : (
<Field
name={name}
datafieldname={datafieldname}
label={label}
options={fieldOptions}
id={name}
validate={[required]}
errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadio}
inline={props.inline}
hint={props.hint}
//validate={eval(validation)}
requiredDocumentLabel={props.requiredDocumentLabel}
requiredDocumentValue={props.requiredDocumentValue}
setDocumentsList={props.setDocumentsList}
documentList={props.documentList}
/>
)}
</>
);
}
const required = (value) => (value ? undefined : "Required");
const [formStep, setFormStep] = useState(0);
@@ -218,13 +420,35 @@ let CreateCase = (props) => {
var appTypeCollection = values.appealTypes;
appTypeCollection = getFormCollectionByID(appTypeCollection);
formStep == 0 && setFormStep(1);
// console.log(values);
whichAppealType =
values.appealTypes == "846040004" && values.confirmHASCAS == "true"
? "846040004"
: values.appealTypes == "846040004" &&
values.confirmHASCAS == "false"
? "846040000"
: values.appealTypes;
// console.log(props.loggedInUser);
var whichAppealType = whichAppealType;
appTypeCollection = getFormCollectionByID(whichAppealType);
// console.log(
// "/newappeal" +
// "/" +
// appTypeCollection.UrlName +
// "?lpa=" +
// values.lpaTypes +
// "&apt=" +
// whichAppealType +
// "&id=" //+
// // data.incidentid
// );
delete values.confirmHASCAS;
console.log(appTypeCollection);
createNewCase(
appTypeCollection.appealTypeID,
@@ -240,7 +464,7 @@ let CreateCase = (props) => {
"?lpa=" +
values.lpaTypes +
"&apt=" +
values.appealTypes.split(",")[0] +
whichAppealType +
"&id=" +
data.incidentid
);
@@ -249,6 +473,7 @@ let CreateCase = (props) => {
.catch(({ err }) => {
console.log(err);
});
// router.replace(
// "/newappeal" +
// "/" +
@@ -263,6 +488,23 @@ let CreateCase = (props) => {
// }
// );
};
const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
var parentField = "appealTypes",
formProps = props.whichForm,
form = "caseForm",
parentFieldShowOnValue = "846040004";
var showIfHasParentShowValue =
parentField != false &&
!_.isEmpty(formProps[form]) &&
_.has(formProps[form].values, parentField) &&
parentFieldShowOnValue.indexOf(
formProps[form].values[parentField].toString()
) > -1;
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
return (
<>
@@ -288,6 +530,20 @@ let CreateCase = (props) => {
"newappeal:select-appeal-type-label-error-msg"
)}
/>
{showIfHasParentShowValue && (
<Radiofield
name={"confirmHASCAS"}
datafieldname={"confirmHASCAS"}
label={t("newappeal:hascas-confirmation-label")}
hint={t("newappeal:hascas-confirmation-hint")}
options="[true|newappeal:yes-option-label,false|newappeal:no-option-label]"
id={"confirmHASCAS"}
className="govuk-radios__input"
validate={"[required]"}
errorMsg={t("newappeal:select-an-option-label")}
/>
)}
<button
type="submit"
className="govuk-button"
+35 -90
View File
@@ -15,98 +15,11 @@
<row>
<cell id="{2902cb65-78c7-40ff-a618-a5423c8287cb}">
<labels>
<label description="Name" languagecode="1033" />
<label description="Case reference" languagecode="1033" />
</labels>
<control id="pinswg_name" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_name" />
</cell>
</row>
<row>
<cell id="{edb2e54a-40cc-57d6-150d-84cd436965be}" showlabel="true" locklevel="0">
<labels>
<label description="Case" languagecode="1033" />
</labels>
<control id="pinswg_advertsids" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_advertsids" disabled="false" uniqueid="{54aaac17-b94d-bba1-82a8-07917d933d4b}">
<parameters>
<AutoResolve>
true
</AutoResolve>
<DisableMru>
false
</DisableMru>
<DisableQuickFind>
false
</DisableQuickFind>
<DisableViewPicker>
false
</DisableViewPicker>
<DefaultViewId>
{9AC51863-58C7-49A0-ADCC-AFD9A4C3EE59}
</DefaultViewId>
<AllowFilterOff>
false
</AllowFilterOff>
</parameters>
</control>
</cell>
</row>
<row>
<cell id="{3b4bd3b6-b352-4438-1da4-86157c44d522}" showlabel="true" locklevel="0">
<labels>
<label description="Associated (LPA)" languagecode="1033" />
</labels>
<control id="pinswg_associatedlpa" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_associatedlpa" disabled="false" uniqueid="{8bc2102c-0000-4721-463d-6b6e64cb6009}">
<parameters>
<AutoResolve>
true
</AutoResolve>
<DisableMru>
false
</DisableMru>
<DisableQuickFind>
false
</DisableQuickFind>
<DisableViewPicker>
true
</DisableViewPicker>
<DefaultViewId>
{0ABD7146-7DE5-EB11-AAC5-00224800BE9C}
</DefaultViewId>
<AllowFilterOff>
false
</AllowFilterOff>
</parameters>
</control>
</cell>
</row>
<row>
<cell id="{832ed08a-b53c-553a-29cc-4c45d9d5c8ab}" showlabel="true" locklevel="0">
<labels>
<label description="Appellant" languagecode="1033" />
</labels>
<control id="pinswg_appellant" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_appellant" disabled="false" uniqueid="{66d6d8e1-2302-53b8-1e96-3281782ca7e4}">
<parameters>
<AutoResolve>
true
</AutoResolve>
<DisableMru>
false
</DisableMru>
<DisableQuickFind>
false
</DisableQuickFind>
<DisableViewPicker>
true
</DisableViewPicker>
<DefaultViewId>
{EF816E54-E5D5-EB11-AAC5-00224800BE9C}
</DefaultViewId>
<AllowFilterOff>
false
</AllowFilterOff>
</parameters>
</control>
</cell>
</row>
</rows>
</section>
</sections>
@@ -495,13 +408,45 @@
</labels>
<rows>
<row>
<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="File upload" languagecode="1033" />
<label description="Site plan" languagecode="1033" hint="Site plan (preferably on a copy of an Ordnance Survey map at not less than 10,000 scale) showing the general location of the proposed development and its boundary. This plan should show two named roads so as to assist the location of the appeal site or premises. The application site should be edged or shaded in red and any other adjoining land owned or controlled by the appellant (if any) edged or shaded in blue." />
</labels>
<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Plans, drawings and documents submitted to the LPA (and list)" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload2" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload2" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="The discontinuance notice" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload3" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload7" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Correspondence with the LPA relating to the application" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Any other material you may deem relevant" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload5" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
</rows>
</section>
</sections>
+41 -28
View File
@@ -21,30 +21,11 @@
</cell>
</row>
<row>
<cell id="{a3018a30-9552-d2a6-5796-78a11a3b1c17}" showlabel="true" locklevel="0">
<cell id="{164eb8e5-6562-923d-5d29-824723d3177a}" showlabel="true" locklevel="0">
<labels>
<label description="Case" languagecode="1033" />
<label description="What is this appeal type?" languagecode="1033" />
</labels>
<control id="pinswg_planningappeals78ids" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_planningappeals78ids" disabled="false" uniqueid="{e66b1aa3-59b9-7508-818e-c5289da259d3}">
</control>
</cell>
</row>
<row>
<cell id="{9cdd3935-7db9-8449-0442-80b615089b76}" showlabel="true" locklevel="0">
<labels>
<label description="Associated (LPA)" languagecode="1033" />
</labels>
<control id="pinswg_localplanningauthority" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_localplanningauthority" disabled="false" uniqueid="{70a200cc-bb9e-6844-4a34-1a602a160655}">
</control>
</cell>
</row>
<row>
<cell id="{a60c3762-2733-ed52-7323-5b8b2c35673a}" showlabel="true" locklevel="0">
<labels>
<label description="Appellant" languagecode="1033" />
</labels>
<control id="pinswg_appellant" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_appellant" disabled="false" uniqueid="{741912d8-01ae-e9d6-1d7c-cc2aedc47696}">
</control>
<control id="pinswg_hascas_appealtype" classid="{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldcontent="[846040000|Householder Appeal,846040001|Minor Commercial appeal]" datafieldname="pinswg_hascas_appealtype" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
</cell>
</row>
</rows>
@@ -312,6 +293,14 @@
<label description="Section" languagecode="1033" />
</labels>
<rows>
<row>
<cell id="{736042e8-d03e-e30e-520e-c2226136c43c}" showlabel="true" locklevel="0">
<labels>
<label description="What is overall the size of the appeal site, as shown on the red line boundary plan? (in hectares)" languagecode="1033" />
</labels>
<control validation="[required]" id="pinswg_areaofsiteinhectaresdec" parentField="pinswg_hascas_appealtype" parentFieldShowOnValue="846040001" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" disabled="false" />
</cell>
</row>
<row>
<cell id="{977a773c-b96c-8e0a-776e-240024ea1839}" showlabel="true" locklevel="0">
<labels>
@@ -325,7 +314,7 @@
<labels>
<label description="Is flooding an issue?" languagecode="1033" />
</labels>
<control validation="[required]" id="pinswg_isfloodingandissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodingandissue" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
<control validation="[required]" id="pinswg_isfloodinganissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodinganissue" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
</cell>
</row>
<row>
@@ -333,7 +322,7 @@
<labels>
<label description="Do the works affect the setting of a Listed Building?" languagecode="1033" />
</labels>
<control validation="[required]" id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{001d4a59-1a09-007c-c0bc-e72b09693863}" />
<control validation="[required]" id="pinswg_developmentaffectsettingifalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingifalisted" disabled="false" uniqueid="{001d4a59-1a09-007c-c0bc-e72b09693863}" />
</cell>
</row>
<row>
@@ -488,21 +477,45 @@
</labels>
<rows>
<row>
<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="File upload" languagecode="1033" />
<label description="Site plan" languagecode="1033" hint="Site plan (preferably on a copy of an Ordnance Survey map at not less than 10,000 scale) showing the general location of the proposed development and its boundary. This plan should show two named roads so as to assist the location of the appeal site or premises. The application site should be edged or shaded in red and any other adjoining land owned or controlled by the appellant (if any) edged or shaded in blue." />
</labels>
<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="File upload2" languagecode="1033" />
<label description="Plans, drawings and documents submitted to the LPA (and list)" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload2" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload2" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Design and Access Statement (if relevant)" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload3" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload3" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Correspondence with the LPA relating to the application" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Any other material you may deem relevant" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload5" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
</rows>
</section>
</sections>
@@ -409,7 +409,7 @@
<labels>
<label description="Please explain why you have chosen this procedure" languagecode="1033" />
</labels>
<control id="pinswg_chosenprocedureexplanation" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_chosenprocedureexplanation" disabled="false" uniqueid="{76e34a67-9087-98a0-037b-c4e2077d3248}" />
<control id="pinswg_chosenprocedureexplanation" parentField="pinswg_procedure" parentFieldShowOnValue="846040001,846040002" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_chosenprocedureexplanation" disabled="false" uniqueid="{76e34a67-9087-98a0-037b-c4e2077d3248}" />
</cell>
</row>
<row>
@@ -417,7 +417,7 @@
<labels>
<label description="Do you intend to submit a costs application with this appeal? (see guidance for further information)" languagecode="1033" />
</labels>
<control validation="[required]" id="pinswg_costappliedforindicator" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_costappliedforindicator" requiredDocumentValue="Yes" requiredDocumentLabel="Statement of costs" disabled="false" uniqueid="{1d56690d-96b4-9338-2935-4a111d9c9e80}" />
<control validation="[required]" id="pinswg_costappliedforindecator" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_costappliedforindecator" requiredDocumentValue="Yes" requiredDocumentLabel="Statement of costs" disabled="false" uniqueid="{1d56690d-96b4-9338-2935-4a111d9c9e80}" />
</cell>
</row>
</rows>
@@ -450,13 +450,61 @@
</labels>
<rows>
<row>
<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="File upload" languagecode="1033" />
<label description="Site plan" languagecode="1033" hint="Site plan (preferably on a copy of an Ordnance Survey map at not less than 10,000 scale) showing the general location of the proposed development and its boundary. This plan should show two named roads so as to assist the location of the appeal site or premises. The application site should be edged or shaded in red and any other adjoining land owned or controlled by the appellant (if any) edged or shaded in blue." />
</labels>
<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Plans, drawings and documents submitted to the LPA (and list)" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload2" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload2" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Design and Access Statement (if relevant)" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload3" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload3" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Correspondence with the LPA relating to the application" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="Any other material you may deem relevant" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="If the appeal is against the LPA's refusal or failure to decide an application which relates to a condition, we must have a copy of the original permission with the condition attached" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload5" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
<row>
<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
<labels>
<label description="If the appeal is against the LPA's failure to decide an application please supply a copy of the LPA's letter registering your application" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload6" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload6" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
</rows>
</section>
</sections>
+5
View File
@@ -9,6 +9,11 @@
"select-default": "Dewiswch...",
"change-link-label": "Newid",
"submit-appeal-button": "Cyflwyno apêl",
"yes-option-label": "Ydw",
"no-option-label": "Na",
"select-an-option-label": "Dewiswch opsiwn",
"hascas-confirmation-label": "Cadarnhau bod angen apêl HAS/CAS",
"hascas-confirmation-hint": "Mae'r llwybr apêl hwn yn berthnasol dim ond os yw'ch cais yn ymwneud â gwrthod caniatâd cynllunio, neu wrthodiad i gais i amrywio neu ddileu amod sydd ynghlwm wrth ganiatâd blaenorol. Bydd pob cais arall yn cael ei gyflwyno drwy Apêl Cynllunio Adran 78",
"about-you-page-title": "Amdanat ti",
"about-you-on-behalf-label": "Cyflwynwyd apêl ar ran:",
"about-you-who-can-appeal-label": "Pwy all apelio?",
+5
View File
@@ -9,6 +9,11 @@
"select-default": "Select...",
"change-link-label": "Change",
"submit-appeal-button": "Submit appeal",
"yes-option-label": "Yes",
"no-option-label": "No",
"select-an-option-label": "Select an option",
"hascas-confirmation-label": "Confirm HAS/CAS appeal is required",
"hascas-confirmation-hint": "This appeal route is only applicable if your application relates the refusal of planning permission, orthe refusal of an application to vary or remove a condition attached to a previous permision. All other applications will be submitted via a Section 78 Planning Appeal",
"about-you-page-title": "About you",
"about-you-on-behalf-label": "Appeal submitted on behalf of:",
"about-you-who-can-appeal-label": "Who can appeal?",
+1
View File
@@ -117,6 +117,7 @@ const Home = (props) => {
LPAData={props.LPAData}
appealType={props.setAppealType}
loggedInUser={props.accountDetails.loggedinUserId}
whichForm={props.form}
/>
</main>
</div>
+2
View File
@@ -28,9 +28,11 @@ html {
.govuk-breadcrumbs__link,
.govuk-fieldset__legend--s,
.govuk-input,
.govuk-textarea,
.govuk-panel,
.govuk-panel__title,
.govuk-warning-text__text,
.govuk-hint,
.app-cookie-banner,
.govuk-error-message.govuk-form-group--error,
h1,