cleared debug, updated new appeal add about you

This commit is contained in:
2022-05-31 10:15:03 +01:00
parent 55a9a15a57
commit f2e71c0b54
49 changed files with 161396 additions and 500 deletions
+104 -90
View File
@@ -41,7 +41,7 @@ export const getToken = () => {
return data;
})
.catch((error) => {
console.log("error :", error.response);
//console.log("error :", error.response);
// return error;
});
};
@@ -130,16 +130,16 @@ export const hashAPIPath = (queryPath) => {
};
export const hashString = (stringToHash) => {
console.log("string to hash", stringToHash);
//console.log("string to hash", stringToHash);
let hashedStr = CryptoJS.AES.encrypt(stringToHash, "pedw");
console.log("hashed String", hashedStr.toString());
//console.log("hashed String", hashedStr.toString());
return hashedStr.toString();
};
export const dehashString = (stringToDeHash) => {
console.log("string to dehash", stringToDeHash);
//console.log("string to dehash", stringToDeHash);
let dehashedStr = CryptoJS.AES.decrypt(decodeURI(stringToDeHash), "pedw");
console.log("dehshed string:", dehashedStr.toString(CryptoJS.enc.Utf8));
//console.log("dehshed string:", dehashedStr.toString(CryptoJS.enc.Utf8));
return dehashedStr.toString(CryptoJS.enc.Utf8);
};
@@ -154,7 +154,7 @@ export const getBasicSearch = (searchString) => {
return res.data;
})
.catch((error) => {
console.log(error);
//console.log(error);
return error.response;
});
};
@@ -170,7 +170,7 @@ export const getPartSavedAppeal = (searchString) => {
return res.data;
})
.catch((error) => {
console.log(error);
//console.log(error);
return error.response;
});
};
@@ -186,7 +186,7 @@ export const getBasicDNSURLSearch = (searchString) => {
return res.data;
})
.catch((error) => {
console.log(error);
//console.log(error);
return error.response;
});
};
@@ -348,7 +348,7 @@ export const getBasicSearchDetails = (
)
.then((res) => res.data)
.catch((error) => {
console.log("this error", error);
console.log("this error", error);
});
};
@@ -358,16 +358,16 @@ export const getBasicPartSavedDetails = (
primaryIdAttribute,
incidentID
) => {
console.log(
"///////api call: ",
BASE_URL +
"/api/endpoint/getbasicpartsaveddetails_api?appealTypeName=" +
appealTypeName +
"&primaryIdAttribute=" +
primaryIdAttribute +
"&incidentID=" +
incidentID
);
// console.log(
// "///////api call: ",
// BASE_URL +
// "/api/endpoint/getbasicpartsaveddetails_api?appealTypeName=" +
// appealTypeName +
// "&primaryIdAttribute=" +
// primaryIdAttribute +
// "&incidentID=" +
// incidentID
// );
return axios
.get(
BASE_URL +
@@ -380,7 +380,7 @@ export const getBasicPartSavedDetails = (
)
.then((res) => res.data)
.catch((error) => {
console.log("this error", error);
console.log("this error", error);
});
};
@@ -403,7 +403,7 @@ export const getBasicSearchDetailsPaged = (
)
.then((res) => res.data)
.catch((error) => {
console.log("this error", error);
console.log("this error", error);
});
};
@@ -415,7 +415,7 @@ export const getSearchDocumentDetails = (incidentID) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -426,7 +426,7 @@ export const getSearchDocumentTypes = (incidentID) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -438,7 +438,7 @@ export const getSearchDocumentDetailsPaged = (
showNumberOfRecords,
documentType
) => {
console.log("to api:", documentType);
//console.log("to api:", documentType);
return axios
.get(
"/api/endpoint/getsearchdocumentdetailspaged_api?incidentid=" +
@@ -456,7 +456,7 @@ export const getSearchDocumentDetailsPaged = (
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -471,7 +471,7 @@ export const getLinkedCases = (parentIncidentid) => {
return res.data;
})
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -480,7 +480,7 @@ export const getAppealsTypes = () => {
.get(BASE_URL + "/api/endpoint/getappealtypes_api")
.then((res) => res.data)
.catch((error) => {
console.log(error);
//console.log(error);
let ErrResponse = {
value: [],
errorCode: error.response.status,
@@ -496,7 +496,7 @@ export const getAppealsTypesForNewAppeal = () => {
.get(BASE_URL + "/api/endpoint/getappealtypesfornewappeal_api")
.then((res) => res.data)
.catch((error) => {
console.log(error);
//console.log(error);
let ErrResponse = {
value: [],
errorCode: error.response.status,
@@ -532,7 +532,7 @@ export const getFormData = (whichForm) => {
.get(BASE_URL + "/api/endpoint/getformdata_api?whichForm=" + whichForm)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -545,7 +545,7 @@ export const getMandatoryFields = (whichForm) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -554,12 +554,12 @@ export const getPickLists = (whichForm) => {
.get(BASE_URL + "/api/endpoint/getpicklists_api?whichForm=" + whichForm)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
export const getPersonalAccount = (contactid) => {
console.log(contactid);
//console.log(contactid);
return axios
.get(
BASE_URL +
@@ -567,17 +567,16 @@ export const getPersonalAccount = (contactid) => {
contactid
)
.then((res) => {
console.log(res.data);
//console.log(res.data);
return res.data;
})
.catch((error) => {
console.log("returned:", error);
//console.log("returned:", error);
// let ErrResponse = {
// value: [],
// errorCode: error.response.status,
// errorMsg: error.response.statusText,
// };
// return ErrResponse;
});
};
@@ -587,13 +586,13 @@ export const getAppealID = (
updateFormCollection,
primaryAttribute
) => {
console.log(
"is this the collection?:",
getFormCollection(updateFormCollection)
);
// console.log(
// "is this the collection?:",
// getFormCollection(updateFormCollection)
// )
let formCollectionName = getFormCollection(updateFormCollection);
console.log(formCollectionName);
//console.log(formCollectionName);
return axios
.get(
"/api/endpoint/getappealid_api?updateFormCollection=" +
@@ -612,7 +611,7 @@ export const getAppealID = (
return appealID;
})
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -626,32 +625,7 @@ export const getLogin = (emailAddress, pwd) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
});
};
export const createCase = (appealTypeId, lpaID, contactid) => {
appealTypeId = parseInt(appealTypeId);
var queryUrl =
"/api/endpoint/createcase_api?appealTypeId=" +
appealTypeId +
"&lpaID=" +
lpaID +
"&contactid=" +
contactid;
var config = {
method: "get",
url: BASE_URL + queryUrl,
};
return axios(config)
.then((res) => {
return res.data;
})
.catch((error) => {
console.log("this serror", error);
//console.log("API call error", error);
});
};
@@ -666,7 +640,7 @@ export const getMyCases = (loggedInUserId) => {
return res.data;
})
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -753,7 +727,7 @@ export const getAwaitingSubmissionProxy = (loggedInUserId) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -768,18 +742,18 @@ export const getAwaitingSubmission = (loggedInUserId) => {
return res.data;
})
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
export const getPortalModuleDetails = (appealType, caseReference) => {
console.log(
BASE_URL +
"/api/endpoint/getportalmoduledetails_api?appealType=" +
appealType +
"&caseReference=" +
encodeURI(caseReference)
);
//console.log(
// BASE_URL +
// "/api/endpoint/getportalmoduledetails_api?appealType=" +
// appealType +
// "&caseReference=" +
// encodeURI(caseReference)
// );
return axios
.get(
BASE_URL +
@@ -790,7 +764,7 @@ export const getPortalModuleDetails = (appealType, caseReference) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -805,7 +779,7 @@ export const getPortalModuleDetailsProxy = (appealType, caseReference) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -818,7 +792,7 @@ export const getEmailAccountCheck = (emailAddress) => {
)
.then((res) => res.data)
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -855,7 +829,7 @@ export const updateAccount = async (contactId, updateBody) => {
return res.data;
})
.catch((error) => {
console.log("this error:", error);
//console.log("this error:", error);
});
};
@@ -878,6 +852,34 @@ export const createWatchedCases = (formValues) => {
});
};
export const createNewCase = (appealTypeId, lpaID, contactid, createBody) => {
appealTypeId = parseInt(appealTypeId);
var data = createBody;
var queryUrl =
"/api/endpoint/createcase_api?appealTypeId=" +
appealTypeId +
"&lpaID=" +
lpaID +
"&contactid=" +
contactid;
var config = {
method: "post",
url: BASE_URL + queryUrl,
data: data,
};
return axios(config)
.then((res) => {
return res.data;
})
.catch((error) => {
console.log("this serror", error);
});
};
export const updateCase = async (
incidentId,
updateBody,
@@ -905,14 +907,14 @@ export const updateCase = async (
data: data,
};
console.log(data);
//console.log(data);
return axios(config)
.then((res) => {
return res.data;
})
.catch((error) => {
console.log("API call error", error);
//console.log("API call error", error);
});
};
@@ -928,7 +930,19 @@ export const patchCase = async (incidentid) => {
return res.data;
})
.catch((error) => {
console.log("this error:", error);
//console.log("this error:", error);
});
};
export const getCase = (incidentID) => {
return axios
.get(BASE_URL + "/api/endpoint/getcase_api?incidentID=" + incidentID)
.then((res) => {
//console.log("//////////----", res.data);
return res.data;
})
.catch((error) => {
console.log("this serror", error);
});
};
@@ -948,7 +962,7 @@ export const deleteMyRepresentations = (myRepresentationsID) => {
"Content-Type": "application/json",
},
};
// console.log(config);
//console.log(config);
return axios(config)
.then((res) => {
//console.log("deleted ", res.data);
@@ -967,7 +981,7 @@ export const deleteAwaitingSubmissions = (incidentID) => {
method: "delete",
url: queryUrl,
};
// console.log(config);
//console.log(config);
return axios(config)
.then((res) => {
//console.log("deleted ", res.data);
@@ -1007,7 +1021,7 @@ export const createAccount = (formValues) => {
return axios(config)
.then((res) => {
// console.log("posted ", res.data);
//console.log("posted ", res.data);
return res.data;
})
.catch((error) => {
@@ -1030,17 +1044,17 @@ export const uploadFiles = (formValues) => {
// data: data,
// headers: { "content-type": "multipart/form-data" },
// onUploadProgress: (event) => {
// console.log(
// //console.log(
// `Current progress:`,
// Math.round((event.loaded * 100) / event.total)
// );
// },
// };
console.log(config);
//console.log(config);
return axios(config)
.then((res) => {
// console.log("posted ", res.data);
//console.log("posted ", res.data);
return res.data;
})
.catch((error) => {
+13 -14
View File
@@ -779,11 +779,11 @@ export function Radiofield(props) {
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
console.log(
datafieldname,
showIfHasParentShowValue,
formProps[form].values[parentField]
);
// console.log(
// datafieldname,
// showIfHasParentShowValue,
// formProps[form].values[parentField]
// );
return (
<>
@@ -1091,7 +1091,8 @@ const PickListTranslations = (optionValue) => {
export function FileUploadField(props) {
return (
<div className="govuk-grid-row">
<>
<h4>{props.label} </h4>
<Field
name={props.name}
id={props.name}
@@ -1101,7 +1102,7 @@ export function FileUploadField(props) {
label={props.label}
errorMsg="Is required"
/>
</div>
</>
);
}
@@ -1293,14 +1294,14 @@ const RenderFileUpload = (field) => {
}
};
return (
<div>
<>
<Dropzone
onDrop={(filesToUpload, e) =>
field.input.onChange(filesToUpload)
}
>
{({ getRootProps, getInputProps }) => (
<div className="govuk-grid-row">
<>
<div className="govuk-form-group"></div>
<section className="container">
<div {...getRootProps({ style })}>
@@ -1310,10 +1311,9 @@ const RenderFileUpload = (field) => {
</div>
<aside>{thumbs}</aside>
</section>
</div>
</>
)}
</Dropzone>
{field.meta.touched && field.meta.error && (
<span className="error">{field.meta.error}</span>
)}
@@ -1328,8 +1328,7 @@ const RenderFileUpload = (field) => {
src={getThumbnailIcon(file, file.type)}
alt={file.name}
width="50"
/>{" "}
{" "}
/>
<span className="govuk-body govuk-!-padding-left-5">
{file.name} ({bytesToSize(file.size)})
</span>
@@ -1337,6 +1336,6 @@ const RenderFileUpload = (field) => {
))}
</ul>
)}
</div>
</>
);
};
+4 -8
View File
@@ -62,22 +62,18 @@ const TopThree = (props) => {
topThreeType == "awaitingSubmission" &&
deleteAwaitingSubmissions(caseID)
.then((data) => {
console.log("zzzzz");
return data;
})
.then(() => {
console.log("qqqqqq");
getAwaitingSubmissionProxy(cookies.pinsUser).then(
(data) => {
console.log("assss", data);
setAwaitingSubmission(data),
getDetails(data, "awaitingSubmission").then(
(data) => {
console.log(
"submission get details:",
data
);
// console.log(
// "submission get details:",
// data
// );
setAwaitingSubmissionDetails(data);
}
);
+392 -81
View File
@@ -2,6 +2,12 @@ import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import { connect } from "react-redux";
import { Field, formValueSelector, reduxForm } from "redux-form";
import {
FieldsTranslations,
Radiofield,
Textfield,
MultiLinefield,
} from "../elements";
let AboutYou = (props) => {
let { t } = useTranslation();
@@ -9,7 +15,7 @@ let AboutYou = (props) => {
const router = useRouter();
const { locale } = router;
const { onSubmit, handleSubmit, appellantAgentValue } = props;
const { onSubmit, handleSubmit, appellantAgentValue, setFormStep } = props;
const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
const appellantAgent =
@@ -161,18 +167,268 @@ let AboutYou = (props) => {
</>
);
};
const RenderMultiline = ({
id,
className,
rows,
datafieldname,
name,
label,
input,
errorMsg,
meta: { touched, error },
...custom
}) => {
return (
<>
<div
className={
touched && error
? "govuk-form-group govuk-form-group--error"
: "govuk-form-group "
}
>
<label
className="govuk-label "
htmlFor={id}
id={id + "_label"}
>
{label}
</label>
{touched && error && (
<span
id={id + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
Error:
</span>{" "}
{touched &&
((error && (
<span>{errorMsg ? errorMsg : error}</span>
)) ||
(warning && <span>{warning}</span>))}
</span>
)}
<textarea
{...input}
rows={rows}
className={className}
></textarea>
</div>
</>
);
};
const RenderRadio = ({
datafieldname,
name,
label,
id,
errorMsg,
options,
input: { onChange, value },
meta: { touched, error },
...custom
}) => {
let { t } = useTranslation();
return (
<>
<div
className={
touched && error
? "govuk-form-group govuk-form-group--error"
: "govuk-form-group "
}
>
<fieldset
className="govuk-fieldset"
aria-describedby={name + "-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 != false && (
<div className="govuk-hint">
{t(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"
className="govuk-radios__input"
value={options[key].split("|")[0]}
// 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="Select an option"
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="Select an option"
component={RenderRadio}
inline={props.inline}
hint={props.hint}
validate={eval(validation)}
requiredDocumentLabel={props.requiredDocumentLabel}
requiredDocumentValue={props.requiredDocumentValue}
setDocumentsList={props.setDocumentsList}
documentList={props.documentList}
/>
)}
</>
);
}
const onHandleSubmit = (values) => {
event.preventDefault();
console.log(values);
router.replace("/newappeal");
console.log(JSON.stringify(values));
setFormStep(1);
};
return (
<form onSubmit={handleSubmit(onHandleSubmit)}>
<Field
name={"onbehalfof"}
id={"onbehalfof"}
name={"pinswg_onbehalfof"}
id={"pinswg_onbehalfof"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -183,37 +439,34 @@ let AboutYou = (props) => {
<details className="govuk-details" data-module="govuk-details">
<summary className="govuk-details__summary">
<span className="govuk-details__summary-text">
Who can appeal?
{t("newappeal:about-you-who-can-appeal-label")}
</span>
</summary>
<div className="govuk-details__text">
Only those named as an applicant on the original
application form can submit an appeal. if you are
submitting an appeal on behalf of a company state the
name of the company you are representing,
{t("newappeal:about-you-who-can-appeal-paragraph")}
</div>
</details>
</div>
<Field
name={"appellantAgent"}
datafieldname={"appellantAgent"}
<Radiofield
name={"pinswg_appellantagent"}
datafieldname={"pinswg_appellantagent"}
label={t("newappeal:about-you-who-are-you-label")}
options={appellantAgent}
id={"appellantAgent"}
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]}
//validate={[required]}
errorMsg="Select an option"
component={RenderYesNo}
/>
{(appellantAgentValue == "Appellant" ||
appellantAgentValue == "Apelydd") && (
{appellantAgentValue == "846040000" && (
<>
<h2 className="govuk-heading-s">
{t("newappeal:about-you-appellant-contact-details")}
</h2>
<Field
name={"appellantfirstname"}
id={"appellantfirstname"}
name={"[pinswg_appellantfirstname"}
id={"pinswg_appellantfirstname"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -223,8 +476,8 @@ let AboutYou = (props) => {
)}
/>
<Field
name={"appellantlastname"}
id={"appellantlastname"}
name={"pinswg_appellantlastname"}
id={"pinswg_appellantlastname"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -232,10 +485,22 @@ let AboutYou = (props) => {
label={t(
"newappeal:about-you-appellant-contact-details-lastname-label"
)}
/>{" "}
/>
<Field
name={"appellantemailaddress"}
id={"appellantemailaddress"}
name={"pinswg_appellantaddress"}
id={"pinswg_appellantaddress"}
component={RenderMultiline}
type="textarea"
className="govuk-textarea govuk-input--width-20"
validate={[required]}
label={t(
"newappeal:about-you-appellant-contact-details-address-label"
)}
rows={4}
/>
<Field
name={"pinswg_appellantemailaddress"}
id={"pinswg_appellantemailaddress"}
component={RenderTextfield}
type="email"
className="govuk-input govuk-input--width-20"
@@ -245,39 +510,50 @@ let AboutYou = (props) => {
)}
/>
<Field
name={"appellantphonenumber"}
id={"appellantphonenumber"}
name={"pinswg_appellantphonenumber"}
id={"pinswg_appellantphonenumber"}
component={RenderTextfield}
type="numberz"
type="number"
className="govuk-input govuk-input--width-20"
validate={[required, phoneNumber]}
label={t(
"newappeal:about-you-appellant-contact-details-phone-label"
)}
/>
<Field
name={"contactPrefs"}
datafieldname={"contactPrefs"}
<Radiofield
name={"pinswg_contactprefs"}
datafieldname={"pinswg_contactprefs"}
label={t(
"newappeal:about-you-agent-contact-preferences-label"
)}
options={contactPref}
id={"contactPrefs"}
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]}
validate={[required]}
errorMsg="Select an option"
/>
<Radiofield
name={"pinswg_languagepreference"}
datafieldname={"pinswg_languagepreference"}
label={t(
"newappeal:about-you-appellant-language-preferences-label"
)}
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"
component={RenderYesNo}
/>
</>
)}
{(appellantAgentValue == "Agent" ||
appellantAgentValue == "Asiant") && (
{appellantAgentValue == "846040001" && (
<>
<h2 className="govuk-heading-s">
{t("newappeal:about-you-appellant-contact-details")}
</h2>
<Field
name={"appellantfirstname"}
name={"pinswg_appellantfirstname"}
id={"appellantfirstname"}
component={RenderTextfield}
type="text"
@@ -288,8 +564,8 @@ let AboutYou = (props) => {
)}
/>
<Field
name={"appellantlastname"}
id={"appellantlastname"}
name={"pinswg_appellantlastname"}
id={"pinswg_appellantlastname"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -297,25 +573,37 @@ let AboutYou = (props) => {
label={t(
"newappeal:about-you-appellant-contact-details-lastname-label"
)}
/>{" "}
/>
<Field
name={"appellantemailaddress"}
id={"appellantemailaddress"}
name={"pinswg_appellantaddress"}
id={"pinswg_appellantaddress"}
component={RenderMultiline}
type="textarea"
className="govuk-textarea govuk-input--width-20"
validate={[required]}
label={t(
"newappeal:about-you-appellant-contact-details-address-label"
)}
rows={4}
/>
<Field
name={"pinswg_appellantemailaddress"}
id={"pinswg_appellantemailaddress"}
component={RenderTextfield}
type="email"
className="govuk-input govuk-input--width-20"
validate={[required, email]}
validate={[required]}
label={t(
"newappeal:about-you-appellant-contact-details-email-label"
)}
/>
<Field
name={"appellantphonenumber"}
id={"appellantphonenumber"}
name={"pinswg_appellantphonenumber"}
id={"pinswg_appellantphonenumber"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
validate={[required, phoneNumber]}
label={t(
"newappeal:about-you-appellant-contact-details-phone-label"
)}
@@ -324,8 +612,8 @@ let AboutYou = (props) => {
{t("newappeal:about-you-agent-contact-details")}
</h2>{" "}
<Field
name={"agentcompanyname"}
id={"agentcompanyname"}
name={"pinswg_agentcompanyname"}
id={"pinswg_agentcompanyname"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -335,8 +623,8 @@ let AboutYou = (props) => {
)}
/>
<Field
name={"agentfirstname"}
id={"agentfirstname"}
name={"pinswg_agentfirstname"}
id={"pinswg_agentfirstname"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -346,8 +634,8 @@ let AboutYou = (props) => {
)}
/>
<Field
name={"agentlastname"}
id={"agentlastname"}
name={"pinswg_agentlastname"}
id={"pinswg_agentlastname"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -357,8 +645,20 @@ let AboutYou = (props) => {
)}
/>{" "}
<Field
name={"agentemailaddress"}
id={"agentemailaddress"}
name={"pinswg_agentaddress"}
id={"pinswg_agentaddress"}
component={RenderMultiline}
type="textarea"
className="govuk-textarea govuk-input--width-20"
validate={[required]}
label={t(
"newappeal:about-you-agent-contact-details-address-label"
)}
rows={4}
/>
<Field
name={"pinswg_agentemailaddress"}
id={"pinswg_agentemailaddress"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
@@ -368,8 +668,8 @@ let AboutYou = (props) => {
)}
/>
<Field
name={"agentphonenumber"}
id={"agentphonenumber"}
name={"pinswg_agentphonenumber"}
id={"pinswg_agentphonenumber"}
component={RenderTextfield}
type="number"
className="govuk-input govuk-input--width-20"
@@ -378,18 +678,29 @@ let AboutYou = (props) => {
"newappeal:about-you-agent-contact-details-phone-label"
)}
/>
<Field
name={"contactPrefs"}
datafieldname={"contactPrefs"}
<Radiofield
name={"pinswg_contactprefs"}
datafieldname={"pinswg_contactprefs"}
label={t(
"newappeal:about-you-agent-contact-preferences-label"
)}
options={contactPref}
id={"contactPrefs"}
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]}
validate={[required]}
errorMsg="Select an option"
/>
<Radiofield
name={"pinswg_languagepreference"}
datafieldname={"pinswg_languagepreference"}
label={t(
"newappeal:about-you-agent-language-preferences-label"
)}
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"
component={RenderYesNo}
/>
</>
)}
@@ -419,30 +730,30 @@ const mapDispatchToProps = (dispatch) => {
return {};
};
AboutYou = reduxForm({
form: "caseForm", // a unique identifier for this form
destroyOnUnmount: false,
})(AboutYou);
// AboutYou = reduxForm({
// form: "caseForm", // a unique identifier for this form
// destroyOnUnmount: false,
// })(AboutYou);
const selector = formValueSelector("caseForm"); // <-- same as form name
AboutYou = connect((state) => {
// can select values individually
const appellantAgentValue = selector(state, "appellantAgent");
const appellantAgentValue = selector(state, "pinswg_appellantagent");
return {
appellantAgentValue,
};
})(AboutYou);
export default AboutYou;
//export default AboutYou;
// export default connect(
// mapStateToProps,
// mapDispatchToProps
// )(
// reduxForm({
// form: "caseForm",
// destroyOnUnmount: false,
// })(AboutYou)
// );
export default connect(
mapStateToProps,
mapDispatchToProps
)(
reduxForm({
form: "caseForm",
destroyOnUnmount: false,
})(AboutYou)
);
-27
View File
@@ -1,27 +0,0 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
export default function MakeAdvertApplication() {
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<div className="card" id="casescomment-card">
<div className="card-body appealModule">
<p className="govuk-body-s">
An appeal relating to an advertisement application or a
discontinuance notice.
</p>
<div className="appealCTA">
<Link href="/newappeal/selectappeal">
<a className="govuk-button">
An advert application/Discontinuance Notice (DN)
</a>
</Link>
</div>
</div>
</div>
);
}
+302
View File
@@ -0,0 +1,302 @@
import jsonpath from "jsonpath";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import { connect } from "react-redux";
import xpath from "xpath";
import { setCurrentSection } from "../../store/appealType/action";
import { FieldsTranslations } from "../elements";
const BuildProgress = (props) => {
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
const {
titleList,
currentSection,
documentListObj,
formObjXML,
mandatoryFieldsData,
gotoSection,
} = props;
const parser = new DOMParser();
const BuildFormObj = (formObjXML) => {
var doc = parser.parseFromString(formObjXML, "text/xml");
var tabs = xpath.select("//form/tabs/tab[*]", doc);
const formObj = Object.keys(tabs).map((key, index) => {
var sectionXML = xpath.select(
"//tabs/tab[" +
(index + 1) +
"]//rows/row/*/control[not(@parentField)]/../..",
doc
);
return BuildRowObj(sectionXML, titleList[key].value);
});
const progressObj = Object.keys(formObj).map((key, index) => {
let fieldObj = formObj[key].fieldsrowObj;
let rowCount = 0;
typeof props.props.initialValues != "undefined" &&
Object.keys(fieldObj).map((key, index) => {
fieldObj[key].datafieldname in props.props.initialValues &&
props.props.initialValues[
fieldObj[key].datafieldname
] != null &&
rowCount++;
});
return {
"title": titleList[key].value,
rowCount,
"totalFields": formObj[key].fieldsTotal,
"allFieldsComplete": rowCount == formObj[key].fieldsTotal,
};
});
return progressObj;
};
const BuildRowObj = (rowXML, titleList) => {
const rowObj = Object.keys(rowXML).map((key, index) => {
var doc = parser.parseFromString(rowXML[key].outerHTML, "text/xml");
if (_.isEmpty(rowXML[key].innerHTML)) {
("");
} else {
var rows = xpath.select("//label/@description", doc);
var fieldtype = xpath.select("//@classid", doc);
var validation = xpath.select("//@validation", doc);
var datafieldname = xpath.select("//@datafieldname", doc);
var datafieldcontent = xpath.select("//@datafieldcontent", doc);
var parentField = xpath.select("//@parentField", doc);
var parentFieldShowOnValue = xpath.select(
"//@parentFieldShowOnValue",
doc
);
var requiredDocumentValue = xpath.select(
"//@requiredDocumentValue",
doc
);
var requiredDocumentLabel = xpath.select(
"//@requiredDocumentLabel",
doc
);
var hint = xpath.select("//label/@hint", doc);
var dateStart = xpath.select("//@dateStart", doc);
var dateEnd = xpath.select("//@dateEnd", doc);
hint = !_.isEmpty(hint) && hint[0].value;
validation = !_.isEmpty(validation) ? validation[0].value : [];
parentField = !_.isEmpty(parentField) && parentField[0].value;
parentFieldShowOnValue =
!_.isEmpty(parentFieldShowOnValue) &&
parentFieldShowOnValue[0].value;
datafieldcontent =
!_.isEmpty(datafieldcontent) && datafieldcontent[0].value;
requiredDocumentValue =
!_.isEmpty(requiredDocumentValue) &&
requiredDocumentValue[0].value;
requiredDocumentLabel =
!_.isEmpty(requiredDocumentLabel) &&
requiredDocumentLabel[0].value;
dateStart = !_.isEmpty(dateStart) && dateStart[0].value;
dateEnd = !_.isEmpty(dateEnd) && dateEnd[0].value;
const isRequiredField = jsonpath.query(
mandatoryFieldsData,
"$..value[?(@.LogicalName=='" +
datafieldname[0].value +
"')]"
);
if (datafieldname[0].value == "pinswg_fileUpload") {
return {
"fieldType": fieldtype[0].value,
"label": rows[0].value,
"datafieldname": datafieldname[0].value,
"key": key,
"picklistData": props.props.formData.pickListData,
"mandatoryFieldsData": mandatoryFieldsData,
};
} else {
if (typeof isRequiredField[0] != "undefined") {
if (isRequiredField[0].RequiredLevel.Value != "None") {
//console.log(datafieldname[0].value, validation);
return {
"fieldType": fieldtype[0].value,
"label": rows[0].value,
"datafieldname": datafieldname[0].value,
"datafieldcontent": datafieldcontent,
"parentField": parentField,
"parentFieldShowOnValue":
parentFieldShowOnValue,
"key": key,
"picklistData":
props.props.formData.pickListData,
"mandatoryFieldsData": mandatoryFieldsData,
"hint": hint,
"requiredDocumentLabel": requiredDocumentLabel,
"requiredDocumentValue": requiredDocumentValue,
"validation": validation,
"dateStart": dateStart,
"dateEnd": dateEnd,
"setDocumentsList":
props.props.setDocumentsList,
"documentList":
props.props.appealType.documentList,
};
} else {
return null;
}
} else {
return null;
}
}
}
});
rowObj = rowObj.filter(function (el) {
return el != null;
});
const filterUnwanted = (rowObj) => {
const required = rowObj.filter((el) => {
return !_.isEmpty(el.validation);
});
return required;
};
return {
"title": titleList,
"validationFieldsTotal": filterUnwanted(rowObj).length,
"fieldsTotal": rowObj.length,
"fieldsrowObj": rowObj,
};
};
const progObj = BuildFormObj(formObjXML);
return (
<>
<nav
role="navigation"
aria-labelledby="progress-list"
className="at-nav"
>
<h3 className="govuk-heading-s govuk-!-font-weight-bold gov-font-dark-grey progress-heading">
{t("newappeal:new-appeal-progress-nav-label")}:{" "}
<span className="progress-case-reference">
{props.props.appealType.caseReference.ticketnumber}
</span>
</h3>
<hr className="govuk-section-break govuk-section-break--m govuk-section-break--visible" />
<ol className="govuk-list">
<ul className="govuk-list ">
<li className="at-nav__page">
<ol className="govuk-list">
{Object.keys(progObj).map((key, index) =>
parseInt(key) + 1 == currentSection ? (
<li key={key}>
<b>
{FieldsTranslations(
progObj[index].title
)}
</b>
</li>
) : (
<li key={key}>
{props.props.appealType
.formComplete == "true" ||
parseInt(key) + 1 <
currentSection ||
progObj[index].allFieldsComplete ==
true ? (
<a
className="govuk-link"
href="#"
onClick={() => {
gotoSection(
parseInt(key) + 1
);
}}
>
{FieldsTranslations(
progObj[index].title
)}
</a>
) : (
FieldsTranslations(
progObj[index].title
)
)}
</li>
)
)}
</ol>
</li>
</ul>
</ol>
</nav>
{Object.keys(documentListObj).length > 0 && (
<div>
<h3 className="govuk-heading-s govuk-!-font-weight-bold gov-font-dark-grey">
{t("newappeal:new-appeal-documentlist-nav")}:
</h3>
<hr className="govuk-section-break govuk-section-break--m govuk-section-break--visible" />
<ol className="govuk-list document-list">
<ul className="govuk-list ">
<li className="at-nav__page">
<ol className="govuk-list govuk-list--bullet">
{Object.entries(documentListObj).map(
([key, value]) => {
return <li key={key}>{value}</li>;
}
)}
</ol>
</li>
</ul>
</ol>
</div>
)}
</>
);
};
const mapStateToProps = (state) => {
return {
search: state.search,
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
initialValues: state.appealType.caseReference.caseDetails,
//form: state.form,
};
};
const mapDispatchToProps = (dispatch) => {
return {
gotoSection: (thisSection) => {
dispatch(setCurrentSection(thisSection));
},
};
};
export default connect(mapStateToProps, mapDispatchToProps)(BuildProgress);
+37 -48
View File
@@ -117,54 +117,43 @@ export default function BuildRow(props) {
// datafieldname[0].value,
// isRequiredField[0].RequiredLevel.Value
// );
if (typeof isRequiredField[0] != "undefined") {
if (
isRequiredField[0].RequiredLevel.Value != "None"
) {
//console.log(datafieldname[0].value, validation);
return (
<BuildField
fieldType={fieldtype[0].value}
label={rows[0].value}
datafieldname={datafieldname[0].value}
datafieldcontent={datafieldcontent}
parentField={parentField}
parentFieldShowOnValue={
parentFieldShowOnValue
}
key={key}
props={props}
picklistData={
props.props.props.formData
.pickListData
}
mandatoryFieldsData={
mandatoryFieldsData
}
hint={hint}
requiredDocumentLabel={
requiredDocumentLabel
}
requiredDocumentValue={
requiredDocumentValue
}
validation={validation}
dateStart={dateStart}
dateEnd={dateEnd}
setDocumentsList={
props.props.setDocumentsList
}
documentList={
props.props.appealType.documentList
}
/>
);
} else {
return null;
}
} else {
return null;
}
// if (typeof isRequiredField[0] != "undefined") {
// if (
// isRequiredField[0].RequiredLevel.Value != "None"
// ) {
//console.log(datafieldname[0].value, validation);
return (
<BuildField
fieldType={fieldtype[0].value}
label={rows[0].value}
datafieldname={datafieldname[0].value}
datafieldcontent={datafieldcontent}
parentField={parentField}
parentFieldShowOnValue={parentFieldShowOnValue}
key={key}
props={props}
picklistData={
props.props.props.formData.pickListData
}
mandatoryFieldsData={mandatoryFieldsData}
hint={hint}
requiredDocumentLabel={requiredDocumentLabel}
requiredDocumentValue={requiredDocumentValue}
validation={validation}
dateStart={dateStart}
dateEnd={dateEnd}
setDocumentsList={props.props.setDocumentsList}
documentList={
props.props.appealType.documentList
}
/>
);
// } else {
// return null;
// }
// } else {
// return null;
// }
}
}
})}
+18 -13
View File
@@ -16,8 +16,8 @@ import { getFormCollectionByID } from "../utils";
import { updateCase, patchCase } from "../../actions";
import { FieldsTranslations } from "../elements";
import { query } from "jsonpath";
import jsonpath from "jsonpath";
import BuildProgress from "./buildprogress";
let BuildSection = (props) => {
// useEffect(() => {
@@ -60,6 +60,8 @@ let BuildSection = (props) => {
doc
);
var formObjXML = xpath.select("/form/tabs", doc);
var titleList = xpath.select(
"//form/tabs/tab[*]/labels/label/@description",
doc
@@ -99,18 +101,11 @@ let BuildSection = (props) => {
}
});
console.log(updateBody);
//console.log(updateBody);
let updateFormCollection = appTypeCollection.LogicalCollectionName;
let primaryAttribute = appTypeCollection.PrimaryIdAttribute;
console.log(
incidentId,
updateBody,
updateFormCollection,
primaryAttribute,
props.appealType.caseReference.ticketnumber
);
updateCase(
incidentId,
updateBody,
@@ -261,7 +256,16 @@ let BuildSection = (props) => {
</div>
<div className="govuk-grid-column-one-third">
<div className="at-nav-container">
<nav
<BuildProgress
props={props}
titleList={titleList}
documentListObj={documentListObj}
formObjXML={formXML}
mandatoryFieldsData={mandatoryFieldsData}
currentSection={currentSection}
initialValues={props.initialValues}
/>
{/* <nav
role="navigation"
aria-labelledby="progress-list"
className="at-nav"
@@ -347,12 +351,13 @@ let BuildSection = (props) => {
</ul>
</ol>
</div>
)}
)} */}
<hr className="govuk-section-break govuk-section-break--m govuk-section-break--visible" />
<button
className="govuk-button govuk-button--secondary progress-save "
onClick={() => {
let valuesObj = props.props.form[props.form].values;
let valuesObj =
props.props.form[props.form].values || {};
console.log("valuesobj:", valuesObj);
+80 -39
View File
@@ -3,6 +3,8 @@ import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import { connect } from "react-redux";
import { Field, formValueSelector, reduxForm } from "redux-form";
import { useState } from "react";
import transLookup from "../../data/lookuptranslations.json";
import {
setAppealLPA,
@@ -12,6 +14,7 @@ import {
import { getFormCollectionByID } from "../utils";
import FileUpload from "./fileupload";
import Aboutyou from "./aboutyou";
import { createNewCase } from "../../actions";
let CreateCase = (props) => {
// useEffect(() => {
@@ -208,6 +211,8 @@ let CreateCase = (props) => {
const required = (value) => (value ? undefined : "Required");
const [formStep, setFormStep] = useState(0);
const onHandleSubmit = (values) => {
event.preventDefault();
@@ -215,48 +220,84 @@ let CreateCase = (props) => {
appTypeCollection = getFormCollectionByID(appTypeCollection);
router.replace(
"/newappeal" +
"/" +
appTypeCollection.UrlName +
"?lpa=" +
values.lpaTypes +
"&apt=" +
values.appealTypes.split(",")[0],
null,
{
shallow: true,
}
);
formStep == 0 && setFormStep(1);
// console.log(values);
// console.log(props.loggedInUser);
createNewCase(
appTypeCollection.appealTypeID,
values.lpaTypes,
props.loggedInUser,
values
)
.then((data) => {
router.replace(
"/newappeal" +
"/" +
appTypeCollection.UrlName +
"?lpa=" +
values.lpaTypes +
"&apt=" +
values.appealTypes.split(",")[0] +
"&id=" +
data.incidentid
);
return data;
})
.catch(({ err }) => {
console.log(err);
});
// router.replace(
// "/newappeal" +
// "/" +
// appTypeCollection.UrlName +
// "?lpa=" +
// values.lpaTypes +
// "&apt=" +
// values.appealTypes.split(",")[0],
// null,
// {
// shallow: true,
// }
// );
};
return (
<form onSubmit={handleSubmit(onHandleSubmit)}>
{/* <Aboutyou /> */}
<Field
name="lpaTypes"
component={RenderLPAList}
optionsObj={lpaOptionsObj}
validate={[required]}
label={t("newappeal:select-lpa-label")}
errorMsg={t("newappeal:select-lpa-label-error-msg")}
/>
<Field
name="appealTypes"
component={RenderAppealTypeList}
optionsObj={appealOptionsObj}
validate={[required]}
label={t("newappeal:select-appeal-type-label")}
errorMsg={t("newappeal:select-appeal-type-label-error-msg")}
/>
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
>
{t("common:continue-button")}
</button>
</form>
<>
{formStep == 0 ? (
<Aboutyou setFormStep={setFormStep} />
) : (
<form onSubmit={handleSubmit(onHandleSubmit)}>
<Field
name="lpaTypes"
component={RenderLPAList}
optionsObj={lpaOptionsObj}
validate={[required]}
label={t("newappeal:select-lpa-label")}
errorMsg={t("newappeal:select-lpa-label-error-msg")}
/>
<Field
name="appealTypes"
component={RenderAppealTypeList}
optionsObj={appealOptionsObj}
validate={[required]}
label={t("newappeal:select-appeal-type-label")}
errorMsg={t(
"newappeal:select-appeal-type-label-error-msg"
)}
/>
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
>
{t("common:continue-button")}
</button>
</form>
)}
</>
);
};
-27
View File
@@ -1,27 +0,0 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
export default function MakeLDC() {
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<div className="card" id="casescomment-card">
<div className="card-body appealModule">
<p className="govuk-body-s">
An appeal relating to an application for a certificate of
lawful use or development.
</p>
<div className="appealCTA">
<Link href="/newappeal/selectappeal">
<a className="govuk-button">
A Lawful Development Certificate (LDC)
</a>
</Link>
</div>
</div>
</div>
);
}
-26
View File
@@ -1,26 +0,0 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
export default function MakeNewAppeal() {
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<div className="card" id="casescomment-card">
<div className="card-body appealModule">
<p className="govuk-body-s">
This includes all householder applications, full planning
applications, outline planning applications, planning listed
building (LB) applications.
</p>
<div className="appealCTA">
<Link href="./newappeal/selectappeal">
<a className="govuk-button">A planning application</a>
</Link>
</div>
</div>
</div>
);
}
@@ -20,33 +20,35 @@
<control id="pinswg_name" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_name" />
</cell>
</row>
<!--
<row>
<cell id="{dd1e5471-6aa1-cb51-9599-009ca779001d}" showlabel="true" locklevel="0">
<labels>
<label description="Case" languagecode="1033" />
</labels>
<control id="pinswg_listedbuildingandconservationrids" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_listedbuildingandconservationrids" disabled="false" uniqueid="{8a039bd8-c9c0-5117-0d32-5556e0cabb05}">
</control>
</cell>
<cell id="{dd1e5471-6aa1-cb51-9599-009ca779001d}" showlabel="true" locklevel="0">
<labels>
<label description="Case" languagecode="1033" />
</labels>
<control id="pinswg_listedbuildingandconservationrids" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_listedbuildingandconservationrids" disabled="false" uniqueid="{8a039bd8-c9c0-5117-0d32-5556e0cabb05}">
</control>
</cell>
</row>
<row>
<cell id="{23843488-4701-46a0-b4ba-61aa02e2aa9b}" 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="{8e70a96a-3376-640e-4973-154a997aab8b}">
</control>
</cell>
<cell id="{23843488-4701-46a0-b4ba-61aa02e2aa9b}" 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="{8e70a96a-3376-640e-4973-154a997aab8b}">
</control>
</cell>
</row>
<row>
<cell id="{55a40c81-973e-c579-aba8-8839da583ed7}" 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="{b993d20e-a610-0db2-b6d2-6d600c5eca1b}">
</control>
</cell>
<cell id="{55a40c81-973e-c579-aba8-8839da583ed7}" 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="{b993d20e-a610-0db2-b6d2-6d600c5eca1b}">
</control>
</cell>
</row>
-->
</rows>
</section>
</sections>
+52 -31
View File
@@ -20,33 +20,6 @@
<control id="pinswg_name" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_name" />
</cell>
</row>
<row>
<cell id="{a3018a30-9552-d2a6-5796-78a11a3b1c17}" showlabel="true" locklevel="0">
<labels>
<label description="Case" 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>
</cell>
</row>
</rows>
</section>
</sections>
@@ -490,6 +463,14 @@
<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}" />
</cell>
</row>
<row>
<cell id="{9d6c3633-98c9-4827-5eb1-90ce085c5045}" showlabel="true" locklevel="0">
<labels>
<label description="Do you intend to submit a planning obligation (a section 106 agreement or a unilateral undertaking) with this appeal?" languagecode="1033" />
</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" uniqueid="{1d56690d-96b4-9338-2935-4a111d9c9e80}" />
</cell>
</row>
</rows>
</section>
</sections>
@@ -520,21 +501,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="{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="Environmental Statement plus certificates and notices relating to publicity (if 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>
<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_fileUpload6" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload6" 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 S106 agreement or unilateral undertaking" languagecode="1033" />
</labels>
<control id="pinswg_fileUpload7" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload7" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
</cell>
</row>
</rows>
</section>
</sections>
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,788 @@
{
"@odata.count": 87,
"value": [
{
"LogicalName": "versionnumber",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "3f2d95f6-bb18-4d27-8ef5-5e2c4133b5b7"
},
{
"LogicalName": "pinswg_retrospectiveapplicationsname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "1cb49176-a2b2-4648-95e0-746276e37b71"
},
{
"LogicalName": "createdon",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "5b8d1e57-b6f0-49cd-acb6-442db7b2e608"
},
{
"LogicalName": "modifiedonbehalfbyyominame",
"RequiredLevel": {
"Value": "SystemRequired",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "193eced0-ef39-4af7-8a7c-f4f6e64292a7"
},
{
"LogicalName": "pinswg_isfloodingandissuename",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "fa143037-b32f-4f1b-babd-26b7a427b0a1"
},
{
"LogicalName": "statuscodename",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "4584df59-57a6-4b6b-b54f-139c6f66316d"
},
{
"LogicalName": "pinswg_target",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "0066ae0c-5b8d-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_decisionissued",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "8d0ba336-5b8d-eb11-aac2-00224800be9c"
},
{
"LogicalName": "modifiedbyyominame",
"RequiredLevel": {
"Value": "SystemRequired",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "ae7bdd48-c949-4428-809a-2a5a37f77221"
},
{
"LogicalName": "pinswg_name",
"RequiredLevel": {
"Value": "ApplicationRequired",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "3bf31a93-5882-eb11-aac0-00224800be9c"
},
{
"LogicalName": "pinswg_agricultureholdingname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "06b09ff5-c7af-458d-aae0-73292d4fff06"
},
{
"LogicalName": "pinswg_sitewithingreenbelt",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "e6f0c463-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_siteviewablefromroadname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "69871673-54b5-43c6-8096-26f681ec7e34"
},
{
"LogicalName": "pinswg_dateofapplication",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "fa8df166-e78b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_siteaddresstown",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "c495e54b-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_isfloodingandissue",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "6e2d1dae-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "overriddencreatedon",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "01b735a7-d566-4b71-a994-184ee8678cd5"
},
{
"LogicalName": "pinswg_listedbuildinggradename",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "5c7021b8-d339-45a0-ba01-f2ddd1551248"
},
{
"LogicalName": "pinswg_siteaddressline2",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "af73752a-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_siteaddressline1",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "16d2c023-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "createdonbehalfbyyominame",
"RequiredLevel": {
"Value": "SystemRequired",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "dcd87843-0b5e-4dd3-8d26-0e8e4acb8bff"
},
{
"LogicalName": "pinswg_validdate",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "d3696003-5b8d-eb11-aac2-00224800be9c"
},
{
"LogicalName": "modifiedonbehalfby",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "48a9a21c-fe22-4cf9-bb04-2107612c1c2e"
},
{
"LogicalName": "pinswg_datenoticeissued",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "e619b47c-e08b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "createdbyyominame",
"RequiredLevel": {
"Value": "SystemRequired",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "29d551ac-6be3-4cc9-98a9-aeca7a4910a7"
},
{
"LogicalName": "statecode",
"RequiredLevel": {
"Value": "SystemRequired",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "919887d5-b71e-4465-bc68-79f3417d3e80"
},
{
"LogicalName": "timezoneruleversionnumber",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "bab13db3-ac49-49bb-acf6-cd3b6280bfd5"
},
{
"LogicalName": "pinswg_lpaapplicationreference",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "24871d89-e78b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_retrospectiveapplications",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "a38a6296-e78b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_nonvalidationidsname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "2d7e6f78-ae18-4bb3-8540-43e9cb0ed61b"
},
{
"LogicalName": "pinswg_associatedlpayominame",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "e5b7f58b-3522-4073-9bf1-f0f2e38a8b41"
},
{
"LogicalName": "pinswg_incarelatestocaname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "21713523-5be0-4cea-9a66-326434eaf141"
},
{
"LogicalName": "pinswg_listedbuildinggrade",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "2641aaed-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_typeofplanningapplicationname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "c0e31a48-4618-4b9b-8dff-d281630d2fcc"
},
{
"LogicalName": "pinswg_landusecategoryname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "c74f978a-8386-4685-a120-330180d13b10"
},
{
"LogicalName": "pinswg_agricultureholding",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "c66be25f-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "traversedpath",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": false,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "88c41812-55b1-4897-90d1-98be871c7b43"
},
{
"LogicalName": "createdonbehalfbyname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "0dc2a644-d2a6-4938-9a64-65cb0f2634de"
},
{
"LogicalName": "pinswg_siteaddresspostcode",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "f6131439-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_developmentaffectsettingofalisted",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "ec26a47f-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_decisionissueddate",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "33efc8bb-c052-ec11-aad5-00224800be9c"
},
{
"LogicalName": "utcconversiontimezonecode",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "032fb3b5-5161-46b7-a370-51d5a2f0b6d9"
},
{
"LogicalName": "pinswg_decisionissuedname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "ca375e24-8286-4093-982c-d55dad7d12b6"
},
{
"LogicalName": "pinswg_nonvalidationids",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "15565d1e-9273-44ee-898a-11677406a71f"
},
{
"LogicalName": "pinswg_dateoflpadecision",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "3971f370-e78b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "modifiedon",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "60b8a222-9ddc-4706-8d30-3978e94b45f5"
},
{
"LogicalName": "importsequencenumber",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "72a37877-6a1a-4f25-80d8-972aadddb91e"
},
{
"LogicalName": "pinswg_typeofplanningapplication",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "d7e4a5a1-e78b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_associatedlpaname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "9a5515f1-ca6a-48ca-9f81-06a0f34afd6d"
},
{
"LogicalName": "processid",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": false,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "16d370e8-dc21-47d6-afbe-b43cdf01061a"
},
{
"LogicalName": "pinswg_landusecategory",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "4c4c31dc-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_appellantname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "daeca746-a0c7-4477-b13f-b4dcc2e12eeb"
},
{
"LogicalName": "pinswg_isthesitewithinanaonbname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "95d9d31c-4e4d-4df4-9d76-7d1b54940d43"
},
{
"LogicalName": "createdbyname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "2b5a37e2-4f3c-4f37-bbb5-6885ab7b01f5"
},
{
"LogicalName": "pinswg_nonvalidationid",
"RequiredLevel": {
"Value": "SystemRequired",
"CanBeChanged": false,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "2a5b84f8-9336-46e2-9ff3-260200ebe816"
},
{
"LogicalName": "modifiedonbehalfbyname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "bb8c1b1c-a710-4c40-adf3-42d3875f40a7"
},
{
"LogicalName": "pinswg_receipt",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "bb65a8f9-5a8d-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_floorspaceinsquaremeters",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "e4c94d92-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "stageid",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": false,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "235cfe89-ce89-4c7d-b705-c31d65cf9e0a"
},
{
"LogicalName": "pinswg_isthesitewithinanaonb",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "2a06b7c4-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_nameofcommonorvillagegreen",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "ea82b5fc-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_landuse",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "c356bed0-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_areaofsiteinhectaresdec",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "74b47c1a-ab01-ec11-aac8-00224800be9c"
},
{
"LogicalName": "createdby",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "172ecb4c-4406-43b1-a0d0-00cbfa92b1c7"
},
{
"LogicalName": "pinswg_developmentdescription",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "fc64287a-e78b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "modifiedby",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "55f78b2f-4a91-4d8c-b35f-ba79147ce3ae"
},
{
"LogicalName": "pinswg_sitewithinsssi",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "4d92fd6e-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_siteviewablefromroad",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "ae342857-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_sitewithinsssiname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "a30c06d2-12b5-44d5-8be2-a7be8dd5fb09"
},
{
"LogicalName": "pinswg_appellantyominame",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "e16dc0ae-7c98-425c-b02a-76668b6d92e2"
},
{
"LogicalName": "pinswg_landusename",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "4ba827aa-b53f-4b36-b49f-cd2c1c52737a"
},
{
"LogicalName": "pinswg_effectivedate",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "9cf8508a-e08b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_associatedlpa",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "438d4e2b-2a2a-4542-ad08-50ed17ced669"
},
{
"LogicalName": "pinswg_ownershipcertificatename",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "3bb57ada-59f2-481f-ace7-b489cbe5401e"
},
{
"LogicalName": "pinswg_siteaddresscounty",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "7a7f0d1c-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "pinswg_developmentaffectsettingofalistedname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "7ac4fb1d-92c3-42b3-ab7f-6cc7699b809a"
},
{
"LogicalName": "pinswg_appellant",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "e3abca6a-7d96-4264-918f-0c6a7e2bb508"
},
{
"LogicalName": "createdonbehalfby",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "51b34e89-21ff-4a38-bde9-f51e7ad323be"
},
{
"LogicalName": "pinswg_ownershipcertificate",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "92c64a11-c788-eb11-aac2-00224800be9c"
},
{
"LogicalName": "statuscode",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "86e9c92f-cc3e-410c-9553-eabec58fdcb8"
},
{
"LogicalName": "modifiedbyname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "0c46ac75-4d62-4dab-8f55-cc4234d69f3f"
},
{
"LogicalName": "organizationid",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "a6fac9e8-1ad7-4091-8198-479aed235201"
},
{
"LogicalName": "pinswg_incarelatestoca",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "d528e9a0-c688-eb11-aac2-00224800be9c"
},
{
"LogicalName": "organizationidname",
"RequiredLevel": {
"Value": "SystemRequired",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "7f17cae5-e603-4809-bc86-7ae94d5169de"
},
{
"LogicalName": "pinswg_noticereference",
"RequiredLevel": {
"Value": "Recommended",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "fb17f99d-e08b-eb11-aac2-00224800be9c"
},
{
"LogicalName": "statecodename",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "cbb1d476-2edf-43ec-bf7a-24d65f815851"
},
{
"LogicalName": "pinswg_sitewithingreenbeltname",
"RequiredLevel": {
"Value": "None",
"CanBeChanged": true,
"ManagedPropertyLogicalName": "canmodifyrequirementlevelsettings"
},
"MetadataId": "e1998d6c-cd80-467e-a397-c2b5a8465df3"
}
]
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+12
View File
@@ -11,19 +11,31 @@
"submit-appeal-button": "Cyflwyno apêl",
"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?",
"about-you-who-can-appeal-paragraph": "Dim ond y rhai a enwir fel ymgeisydd ar y ffurflen gais wreiddiol all gyflwyno apêl. os ydych yn cyflwyno apêl ar ran cwmni nodwch enw'r cwmni yr ydych yn ei gynrychioli",
"about-you-who-are-you-label": "Ai chi yw'r apelydd neu asiant sy'n gweithredu ar ran yr apelydd?",
"about-you-who-are-you-label-appellant": "Apelydd",
"about-you-who-are-you-label-agent": "Asiant",
"about-you-appellant-contact-details": "Manylion cyswllt yr Apelydd",
"about-you-appellant-contact-details-firstname-label": "Enw cyntaf",
"about-you-appellant-contact-details-lastname-label": "Enw olaf",
"about-you-appellant-contact-details-address-label": "Cyfeiriad",
"about-you-appellant-contact-details-email-label": "Cyfeiriad ebost",
"about-you-appellant-contact-details-phone-label": "Rhif ffôn",
"about-you-appellant-language-preferences-label": "Dewis iaith",
"about-you-agent-contact-details": "Manylion cyswllt yr Asiant",
"about-you-agent-contact-details-companyname-label": "Enw cwmni",
"about-you-agent-contact-details-firstname-label": "Enw cyntaf",
"about-you-agent-contact-details-lastname-label": "Enw olaf",
"about-you-agent-contact-details-address-label": "Cyfeiriad",
"about-you-agent-contact-details-email-label": "Cyfeiriad ebost",
"about-you-agent-contact-details-phone-label": "Rhif ffôn",
"about-you-agent-contact-preferences-label": "Nodwch a fyddai'n well gennych i ni gysylltu â chi drwy e-bost neu'r post",
"about-you-agent-contact-preferences-value-email": "Ebost",
"about-you-agent-contact-preferences-value-post": "Post",
"about-you-agent-language-preferences-label": "Dewis iaith",
"about-you-agent-language-preferences-value-english": "Saesneg",
"about-you-agent-language-preferences-value-welsh": "Cymraeg",
"new-appeal-progress-nav-label": "Cynnydd",
"new-appeal-documentlist-nav": "Angen dogfen",
"new-appeal-introduction-paragraph": "Intro text to explain process. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer ornare lobortis sollicitudin. Pellentesque ac libero auctor, efficitur urna faucibus, fringilla nisi. Fusce viverra pharetra tristique. In diam est, interdum sagittis tempus non, ultricies at ante. Nullam porta dolor sit amet.",
+12
View File
@@ -11,19 +11,31 @@
"submit-appeal-button": "Submit 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?",
"about-you-who-can-appeal-paragraph": "Only those named as an applicant on the original application form can submit an appeal. if you are submitting an appeal on behalf of a company state the name of the company you are representing",
"about-you-who-are-you-label": "Are you the appellant or an agent acting on behalf of the appeallant?",
"about-you-who-are-you-label-appellant": "Appellant",
"about-you-who-are-you-label-agent": "Agent",
"about-you-appellant-contact-details": "Contact details for Appellant",
"about-you-appellant-contact-details-firstname-label": "First name",
"about-you-appellant-contact-details-lastname-label": "Last name",
"about-you-appellant-contact-details-address-label": "Address",
"about-you-appellant-contact-details-email-label": "Email address",
"about-you-appellant-contact-details-phone-label": "Telphone number",
"about-you-appellant-language-preferences-label": "Language preference",
"about-you-agent-contact-details": "Contact details for Agent",
"about-you-agent-contact-details-companyname-label": "Company name",
"about-you-agent-contact-details-firstname-label": "First name",
"about-you-agent-contact-details-lastname-label": "Last name",
"about-you-agent-contact-details-address-label": "Address",
"about-you-agent-contact-details-email-label": "Email address",
"about-you-agent-contact-details-phone-label": "Telephone number",
"about-you-agent-contact-preferences-label": "Please indicate if you would prefer to be contacted by email or post",
"about-you-agent-contact-preferences-value-email": "Email",
"about-you-agent-contact-preferences-value-post": "Post",
"about-you-agent-language-preferences-label": "Language preference",
"about-you-agent-language-preferences-value-english": "English",
"about-you-agent-language-preferences-value-welsh": "Welsh",
"new-appeal-progress-nav-label": "Progress",
"new-appeal-documentlist-nav": "Documents needed",
"new-appeal-introduction-paragraph": "Intro text to explain process. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer ornare lobortis sollicitudin. Pellentesque ac libero auctor, efficitur urna faucibus, fringilla nisi. Fusce viverra pharetra tristique. In diam est, interdum sagittis tempus non, ultricies at ante. Nullam porta dolor sit amet.",
+9 -4
View File
@@ -22,22 +22,27 @@ const hashAPIPath = (queryPath) => {
};
export default async function ApiProxy(req, res) {
var createCaseBody = req.body;
var contactid = req.query.contactid;
var appealTypeId = req.query.appealTypeId;
var lpaID = req.query.lpaID;
var queryUrl = "incidents";
var token = await getToken();
var data = JSON.stringify({
var data = {
"title": "insertion test case",
"caseorigincode": 3,
"servicestage": 1,
"customerid_contact@odata.bind": "/contacts(" + contactid + ")",
"pinswg_appealcasetype": appealTypeId,
"pinswg_AssociatedLPA@odata.bind": "/accounts(" + lpaID + ")",
});
};
var newData = Object.assign(data, createCaseBody);
console.log(data, WEBAPI_URL + queryUrl);
delete newData.lpaTypes;
delete newData.appealTypes;
console.log("/////Create Case:", newData);
var config = {
method: "post",
@@ -50,7 +55,7 @@ export default async function ApiProxy(req, res) {
"Authorization": "Bearer " + token.access_token,
"Content-Type": "application/json",
},
data: data,
data: JSON.stringify(data),
};
var apiResponse = _.isEmpty(req.query)
@@ -40,7 +40,7 @@ export default async function ApiProxy(req, res) {
return axios(config)
.then(({ data }) => {
console.log("deleted awaitingsubmission case - " + incidentID);
//console.log("deleted awaitingsubmission case - " + incidentID);
res.status(200).json(data);
})
.catch(({ err }) => {
@@ -40,7 +40,6 @@ export default async function ApiProxy(req, res) {
return axios(config)
.then(({ data }) => {
console.log("deleted ");
res.status(200).json(data);
})
.catch(({ err }) => {
@@ -74,7 +74,7 @@ export default async function ApiProxy(req, res) {
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
: "");
console.log("adv qu: ", queryUrl);
//console.log("adv qu: ", queryUrl);
var apiResponse = _.isEmpty(searchString)
? res.status(400).json()
+2 -1
View File
@@ -37,7 +37,8 @@ export default async function ApiProxy(req, res) {
"stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'LDP' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
//"stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'Developments of National Significance' and value ne 'LDP' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
console.log(queryUrl);
//console.log(queryUrl);
return axios
.get(
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
@@ -35,7 +35,7 @@ export default async function ApiProxy(req, res) {
data.value.forEach(function (element) {
element.pinswg_title = element.title;
});
console.log(data);
//console.log(data);
res.status(200).json(data);
})
.catch(({ err }) => {
+1 -1
View File
@@ -27,7 +27,7 @@ export default async function ApiProxy(req, res) {
var queryUrl =
"incidents?$select=description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
console.log(queryUrl);
//console.log(queryUrl);
return axios
.get(
@@ -32,7 +32,7 @@ export default async function ApiProxy(req, res) {
searchString +
"')) and pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
console.log("basic search ", queryUrl);
//console.log("basic search ", queryUrl);
var apiResponse = _.isEmpty(req.query)
? res.status(400).json()
+1 -1
View File
@@ -32,7 +32,7 @@ export default async function ApiProxy(req, res) {
searchString +
"')) and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
console.log("basic search ", queryUrl);
//console.log("basic search ", queryUrl);
var apiResponse = _.isEmpty(req.query)
? res.status(400).json()
+44
View File
@@ -0,0 +1,44 @@
import axios from "axios";
import CryptoJS from "crypto-js";
import _ from "lodash";
import { getToken, azureHeaders } from "../../../actions";
const WORDKEY = process.env.HASHKEY;
const WEBAPI_URL =
process.env.RELAY_ROOT ||
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
const hashAPIPath = (queryPath) => {
var hashlink = CryptoJS.HmacSHA256(
queryPath,
CryptoJS.enc.Hex.parse(WORDKEY)
);
hashlink = hashlink.toString(CryptoJS.enc.Hex);
//return "&hash=" + hashlink;
return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
};
export default async function ApiProxy(req, res) {
var incidentID = req.query.incidentID;
var token = await getToken();
var queryUrl = "incidents(" + incidentID + ")?$select=ticketnumber,title";
return axios
.get(
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
azureHeaders(token.access_token)
)
.then(({ data }) => {
var dataStr;
_.has(data, "@odata.nextLink") == true &&
((dataStr = JSON.stringify(data["@odata.nextLink"])),
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
res.status(200).json(data);
})
.catch(({ err }) => {
res.status(400).json(err);
});
}
+2 -1
View File
@@ -26,7 +26,8 @@ export default async function ApiProxy(req, res) {
var queryUrl =
"pinswg_dnses?$select=pinswg_name,pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,pinswg_projectname,pinswg_dnsid,_pinswg_associatedlpa_value,_pinswg_appellant_value&$filter=pinswg_anticipatedgridreferencenorthingtext ne null and pinswg_anticipatedgridreferenceeastingtext ne null&$count=true";
console.log("dns ", queryUrl);
//console.log("dns ", queryUrl);
return axios
.get(
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+1 -1
View File
@@ -30,7 +30,7 @@ export default async function ApiProxy(req, res) {
pwd +
"'&$count=true&$select=emailaddress1,contactid,pinswg_custom_password,yomifullname,firstname,lastname";
console.log(_.isEmpty(req.query));
//console.log(_.isEmpty(req.query));
var apiResponse = _.isEmpty(req.query)
? res.status(400).json()
+8 -28
View File
@@ -8,37 +8,17 @@ const WEBAPI_URL =
process.env.RELAY_ROOT ||
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
const hashAPIPath = (queryPath) => {
var hashlink = CryptoJS.HmacSHA256(
queryPath,
CryptoJS.enc.Hex.parse(WORDKEY)
);
hashlink = hashlink.toString(CryptoJS.enc.Hex);
//return "&hash=" + hashlink;
return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
};
export default async function ApiProxy(req, res) {
var whichForm = req.query.whichForm;
var token = await getToken();
var queryUrl =
"EntityDefinitions(LogicalName='pinswg_" +
// var queryUrl =
// "EntityDefinitions(LogicalName='pinswg_" +
// whichForm +
// "')/Attributes?$count=true&$select=LogicalName,RequiredLevel";
const mandatoryFieldsData = require("../../../data/mandatoryfields/pinswg_" +
whichForm +
"')/Attributes?$count=true&$select=LogicalName,RequiredLevel";
".json");
console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
return axios
.get(
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
azureHeaders(token.access_token)
)
.then(({ data }) => {
res.status(200).json(data);
})
.catch(({ err }) => {
res.status(400).json(err);
});
return res.status(200).json(mandatoryFieldsData);
}
+1 -1
View File
@@ -32,7 +32,7 @@ export default async function ApiProxy(req, res) {
searchString +
"')) and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
console.log("basic search ", queryUrl);
//console.log("basic search ", queryUrl);
var apiResponse = _.isEmpty(req.query)
? res.status(400).json()
+8 -26
View File
@@ -8,35 +8,17 @@ const WEBAPI_URL =
process.env.RELAY_ROOT ||
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
const hashAPIPath = (queryPath) => {
var hashlink = CryptoJS.HmacSHA256(
queryPath,
CryptoJS.enc.Hex.parse(WORDKEY)
);
hashlink = hashlink.toString(CryptoJS.enc.Hex);
return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
};
export default async function ApiProxy(req, res) {
var whichForm = req.query.whichForm;
var token = await getToken();
var queryUrl =
"EntityDefinitions(LogicalName='pinswg_" +
// var queryUrl =
// "EntityDefinitions(LogicalName='pinswg_" +
// whichForm +
// "')/Attributes/Microsoft.Dynamics.CRM.PicklistAttributeMetadata?$select=LogicalName&$expand=OptionSet,GlobalOptionSet&$count=true";
const pickListData = require("../../../data/picklistdata/pinswg_" +
whichForm +
"')/Attributes/Microsoft.Dynamics.CRM.PicklistAttributeMetadata?$select=LogicalName&$expand=OptionSet,GlobalOptionSet&$count=true";
".json");
console.log("get pick list for " + whichForm + ": ", queryUrl);
return axios
.get(
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
azureHeaders(token.access_token)
)
.then(({ data }) => {
res.status(200).json(data);
})
.catch(({ err }) => {
res.status(400).json(err);
});
return res.status(200).json(pickListData);
}
+1 -2
View File
@@ -44,14 +44,13 @@ export default async function ApiProxy(req, res) {
data: data,
};
console.log("update case:", data);
//console.log("update case:", data);
return axios(config)
.then(({ data }) => {
res.status(200).json(data);
})
.catch((error) => {
console.log("is it", error);
res.status(400);
});
}
+8 -1
View File
@@ -223,10 +223,17 @@ export const getServerSideProps = wrapper.getServerSideProps(
let searchResultsObj = await getPartSavedAppeal(query.casereference);
//console.log("eeee:", searchResultsObj);
let searchDetailsObj = await getPartSavedDetails(searchResultsObj);
console.log("appeal:", searchDetailsObj[0].value[0]);
searchDetailsObj = searchDetailsObj[0].value[0];
Object.keys(searchDetailsObj).forEach((key) => {
if (searchDetailsObj[key] === null) {
delete searchDetailsObj[key];
}
});
console.log("appeal:", searchDetailsObj);
searchDetailsObj = JSON.stringify(searchDetailsObj);
searchDetailsObj = searchDetailsObj.replace(/:true/gm, `:"Yes"`);
searchDetailsObj = searchDetailsObj.replace(/:false/gm, `:"No"`);
+6 -2
View File
@@ -8,6 +8,7 @@ import { connect } from "react-redux";
import xpath from "xpath";
import {
createCase,
getCase,
getAppealsTypes,
getMandatoryFields,
getPickLists,
@@ -211,6 +212,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
console.log(cookies);
console.log("the query", query);
console.log("ref:", query.id);
let loggedInUser = cookies.pinsUser;
const [
@@ -219,13 +221,15 @@ export const getServerSideProps = wrapper.getServerSideProps(
mandatoryFieldsData,
pickListData,
] = await Promise.all([
await createCase(query.apt, query.lpa, loggedInUser),
await getCase(query.id),
await getAppealsTypes(),
await getMandatoryFields(query.appealtypes),
await getPickLists(query.appealtypes),
]);
let caseReference = caseReferenceData;
console.log("anything here", loggedInUser, query.id, caseReferenceData);
let caseReference = caseReferenceData; //caseReferenceData.ticketnumber;
var path = require("path");
const configDirectory = path.resolve(process.cwd(), "data/formsxml");
+2 -1
View File
@@ -109,6 +109,7 @@ const Home = (props) => {
<CreateCase
LPAData={props.LPAData}
appealType={props.setAppealType}
loggedInUser={props.accountDetails.loggedinUserId}
/>
</main>
</div>
@@ -125,7 +126,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
const { req, res } = ctx;
const { cookies } = req;
console.log(cookies);
console.log("/newappeal - cookies ", cookies);
let loggedInUser = cookies.pinsUser;
+1
View File
@@ -290,6 +290,7 @@ a.longLinkBreak {
.govuk-input,
.govuk-select,
textarea,
.govuk-textarea,
.react-datepicker__input-container input {
border: 1px solid $darkgrey;
padding: 7px 15px;