pass in locale to questionnaire for welsh version
This commit is contained in:
@@ -289,6 +289,8 @@ const RepCompleteSubmit = (props) => {
|
||||
return;
|
||||
}
|
||||
|
||||
repFormData.locale = router.locale == "cy" ? "cy" : "en";
|
||||
|
||||
const pdfBlob = await generateRepPDF(
|
||||
repFormData,
|
||||
containerID,
|
||||
|
||||
+56
-56
@@ -14,12 +14,12 @@ import {
|
||||
RenderPickList,
|
||||
RenderRadioList,
|
||||
RenderRichMultiline,
|
||||
RenderTextfield,
|
||||
RenderTextfield
|
||||
} from "../representationElements";
|
||||
import {
|
||||
setRepresentationCapacity,
|
||||
setRepresentationSubmit,
|
||||
setFilesForRepresentations,
|
||||
setFilesForRepresentations
|
||||
} from "../../../../store/currentView/action";
|
||||
|
||||
let Enforcement_Questionnaire = (props) => {
|
||||
@@ -36,7 +36,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
procedureTypeValue,
|
||||
onBehalfOfLPA,
|
||||
showQuestionnaireSection,
|
||||
setFilesForRepresentations,
|
||||
setFilesForRepresentations
|
||||
} = props;
|
||||
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
|
||||
const files = acceptedFiles.map((file) => (
|
||||
@@ -50,32 +50,32 @@ let Enforcement_Questionnaire = (props) => {
|
||||
? router.query.state == "edit"
|
||||
? props.props.myRepresentations.myRepresentations
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj;
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj;
|
||||
|
||||
var detailsObj = {};
|
||||
|
||||
detailsObj = jsonpath({
|
||||
path:
|
||||
'$..[?(@ && @.pinswg_name=="' +
|
||||
currentView.caseReference.currentReference +
|
||||
currentView.caseReference.ticketnumber +
|
||||
'")]',
|
||||
json: setCaseDetailsObj,
|
||||
eval: true,
|
||||
eval: true
|
||||
});
|
||||
|
||||
let setCaseResultssObj = router.query.hasOwnProperty("state")
|
||||
? router.query.state == "edit"
|
||||
? props.props.myRepresentations.myRepresentations
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj;
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj;
|
||||
|
||||
detailsObj = detailsObj[0];
|
||||
|
||||
@@ -84,10 +84,10 @@ let Enforcement_Questionnaire = (props) => {
|
||||
resultsObj = jsonpath({
|
||||
path:
|
||||
'$..[?(@ && @.ticketnumber=="' +
|
||||
currentView.caseReference.currentReference +
|
||||
currentView.caseReference.ticketnumber +
|
||||
'")]',
|
||||
json: setCaseResultssObj,
|
||||
eval: true,
|
||||
eval: true
|
||||
});
|
||||
resultsObj = resultsObj[0];
|
||||
|
||||
@@ -118,7 +118,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
<div className="govuk-form-group">
|
||||
<div className="govuk-label">
|
||||
2. {t("myrepresentations:enf-section-question-2")}:{" "}
|
||||
{resultsObj.pinswg_lpareference}
|
||||
{resultsObj.pinswg_lpareference || ""}
|
||||
</div>
|
||||
</div>
|
||||
<div className="govuk-form-group">
|
||||
@@ -155,7 +155,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
optionsArr={[
|
||||
"Written representations",
|
||||
"Hearing",
|
||||
"Inquiry",
|
||||
"Inquiry"
|
||||
]}
|
||||
id="procedureType"
|
||||
component={RenderPickList}
|
||||
@@ -190,7 +190,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -207,7 +207,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="enterNeighbouringLandToViewSite"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="enterNeighbouringLandToViewSite"
|
||||
className="govuk-radios__input"
|
||||
@@ -236,7 +236,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="enterNeighbouringLandAccessRequired"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="enterNeighbouringLandAccessRequired"
|
||||
className="govuk-radios__input"
|
||||
@@ -265,7 +265,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="healthAndSafetyIssues"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="healthAndSafetyIssues"
|
||||
className="govuk-radios__input"
|
||||
@@ -328,7 +328,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -342,7 +342,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="feeExempt"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="feeExempt"
|
||||
className="govuk-radios__input"
|
||||
@@ -379,7 +379,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="previousGrantedCerts"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="previousGrantedCerts"
|
||||
className="govuk-radios__input"
|
||||
@@ -406,7 +406,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="stopNoticeServed"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="stopNoticeServed"
|
||||
className="govuk-radios__input"
|
||||
@@ -433,7 +433,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="relatedCases"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="relatedCases"
|
||||
className="govuk-radios__input"
|
||||
@@ -460,7 +460,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="previousEnforcement"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="previousEnforcement"
|
||||
className="govuk-radios__input"
|
||||
@@ -487,7 +487,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="subjectArticle4"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="subjectArticle4"
|
||||
className="govuk-radios__input"
|
||||
@@ -514,7 +514,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="previousPDRRestriction"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="previousPDRRestriction"
|
||||
className="govuk-radios__input"
|
||||
@@ -594,7 +594,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -621,7 +621,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -635,7 +635,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="ROW"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="ROW"
|
||||
className="govuk-radios__input"
|
||||
@@ -662,7 +662,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="conservationArea"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="conservationArea"
|
||||
className="govuk-radios__input"
|
||||
@@ -689,7 +689,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="affectListedBuilding"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="affectListedBuilding"
|
||||
className="govuk-radios__input"
|
||||
@@ -716,7 +716,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="TPO"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="TPO"
|
||||
className="govuk-radios__input"
|
||||
@@ -743,7 +743,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="natureConservationSite"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="natureConservationSite"
|
||||
className="govuk-radios__input"
|
||||
@@ -770,7 +770,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="protectedSpecies"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="protectedSpecies"
|
||||
className="govuk-radios__input"
|
||||
@@ -802,7 +802,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -816,7 +816,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="floodingIssue"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="floodingIssue"
|
||||
className="govuk-radios__input"
|
||||
@@ -843,7 +843,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="governmentDepartmentComments"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="governmentDepartmentComments"
|
||||
className="govuk-radios__input"
|
||||
@@ -884,7 +884,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="developmentCarriedOutInAccordance"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="developmentCarriedOutInAccordance"
|
||||
className="govuk-radios__input"
|
||||
@@ -915,7 +915,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -932,7 +932,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -946,7 +946,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="developmentAnyOtherConditions"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="developmentAnyOtherConditions"
|
||||
className="govuk-radios__input"
|
||||
@@ -987,7 +987,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="copyOfEnforcementNotice"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="copyOfEnforcementNotice"
|
||||
className="govuk-radios__input"
|
||||
@@ -1014,7 +1014,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="enforcementNoticePlan"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="enforcementNoticePlan"
|
||||
className="govuk-radios__input"
|
||||
@@ -1041,7 +1041,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="listOfNotifiedOfEnforcement"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="listOfNotifiedOfEnforcement"
|
||||
className="govuk-radios__input"
|
||||
@@ -1068,7 +1068,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="copyOfLetterOfAppealNotification"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="copyOfLetterOfAppealNotification"
|
||||
className="govuk-radios__input"
|
||||
@@ -1095,7 +1095,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="lpaEIAOS"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="lpaEIAOS"
|
||||
className="govuk-radios__input"
|
||||
@@ -1125,7 +1125,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="detailsOfOtherAppeals"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="detailsOfOtherAppeals"
|
||||
className="govuk-radios__input"
|
||||
@@ -1152,7 +1152,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="detailsOfPreviousAppeals"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="detailsOfPreviousAppeals"
|
||||
className="govuk-radios__input"
|
||||
@@ -1179,7 +1179,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
datafieldname="otherRelevantInformation"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="otherRelevantInformation"
|
||||
className="govuk-radios__input"
|
||||
@@ -1312,7 +1312,7 @@ Enforcement_Questionnaire = connect((state) => {
|
||||
|
||||
return {
|
||||
procedureTypeValue,
|
||||
representationTypeValue,
|
||||
representationTypeValue
|
||||
};
|
||||
})(Enforcement_Questionnaire);
|
||||
|
||||
@@ -1323,7 +1323,7 @@ const mapDispatchToProps = (dispatch) => {
|
||||
|
||||
setFilesForRepresentations: (fileList) => {
|
||||
dispatch(setFilesForRepresentations(fileList));
|
||||
},
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1335,7 +1335,7 @@ const mapStateToProps = (state, props) => {
|
||||
appealType: state.appealType,
|
||||
currentView: state.currentView,
|
||||
myRepresentations: state.myRepresentations,
|
||||
initialValues: state.currentView.caseReference.repDetails,
|
||||
initialValues: state.currentView.caseReference.repDetails
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1346,6 +1346,6 @@ export default connect(
|
||||
reduxForm({
|
||||
form: "representationForm",
|
||||
enableReinitialize: false,
|
||||
destroyOnUnmount: false,
|
||||
destroyOnUnmount: false
|
||||
})(Enforcement_Questionnaire)
|
||||
);
|
||||
|
||||
+50
-49
@@ -4,6 +4,7 @@ import { useRouter } from "next/router";
|
||||
import { useDropzone } from "react-dropzone";
|
||||
import { Field, reduxForm, formValueSelector } from "redux-form";
|
||||
import { getFormCollectionByID } from "../../../../components/utils";
|
||||
|
||||
import {
|
||||
FileUploadField,
|
||||
RenderDatePicker,
|
||||
@@ -12,12 +13,12 @@ import {
|
||||
RenderPickList,
|
||||
RenderRadioList,
|
||||
RenderRichMultiline,
|
||||
RenderTextfield,
|
||||
RenderTextfield
|
||||
} from "../representationElements";
|
||||
import {
|
||||
setRepresentationCapacity,
|
||||
setRepresentationSubmit,
|
||||
setFilesForRepresentations,
|
||||
setFilesForRepresentations
|
||||
} from "../../../../store/currentView/action";
|
||||
|
||||
import { connect } from "react-redux";
|
||||
@@ -38,7 +39,7 @@ let S78_Questionnaire = (props) => {
|
||||
procedureTypeValue,
|
||||
onBehalfOfLPA,
|
||||
showQuestionnaireSection,
|
||||
setFilesForRepresentations,
|
||||
setFilesForRepresentations
|
||||
} = props;
|
||||
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
|
||||
const files = acceptedFiles.map((file) => (
|
||||
@@ -52,32 +53,32 @@ let S78_Questionnaire = (props) => {
|
||||
? router.query.state == "edit"
|
||||
? props.props.myRepresentations.myRepresentations
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj;
|
||||
? props.props.watchedCases.watchedCasesDetails
|
||||
: props.props.searchResultsObj.searchDetailsObj;
|
||||
|
||||
var detailsObj = {};
|
||||
|
||||
detailsObj = jsonpath({
|
||||
path:
|
||||
'$..[?(@ && @.pinswg_name=="' +
|
||||
currentView.caseReference.currentReference +
|
||||
'$..[?(@ && @.ticketnumber=="' +
|
||||
currentView.caseReference.ticketnumber +
|
||||
'")]',
|
||||
json: setCaseDetailsObj,
|
||||
eval: true,
|
||||
eval: true
|
||||
});
|
||||
|
||||
let setCaseResultssObj = router.query.hasOwnProperty("state")
|
||||
? router.query.state == "edit"
|
||||
? props.props.myRepresentations.myRepresentations
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj
|
||||
: currentView.caseReference.currentType == "watchedCases"
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj;
|
||||
? props.props.watchedCases.watchedCases
|
||||
: props.props.searchResultsObj.searchResultsObj;
|
||||
|
||||
detailsObj = detailsObj[0];
|
||||
|
||||
@@ -92,10 +93,10 @@ let S78_Questionnaire = (props) => {
|
||||
: "ticketnumber"
|
||||
: "ticketnumber") +
|
||||
'=="' +
|
||||
currentView.caseReference.currentReference +
|
||||
currentView.caseReference.ticketnumber +
|
||||
'")]',
|
||||
json: setCaseResultssObj,
|
||||
eval: true,
|
||||
eval: true
|
||||
});
|
||||
resultsObj = resultsObj[0];
|
||||
|
||||
@@ -136,7 +137,7 @@ let S78_Questionnaire = (props) => {
|
||||
<div className="govuk-form-group">
|
||||
<div className="govuk-label">
|
||||
2. {t("myrepresentations:s78-section-question-2")}:{" "}
|
||||
{resultsObj.pinswg_lpareference}
|
||||
{resultsObj.pinswg_lpareference || ""}
|
||||
</div>
|
||||
</div>
|
||||
<div className="govuk-form-group">
|
||||
@@ -175,7 +176,7 @@ let S78_Questionnaire = (props) => {
|
||||
optionsArr={[
|
||||
"Written representations",
|
||||
"Hearing",
|
||||
"Inquiry",
|
||||
"Inquiry"
|
||||
]}
|
||||
id="procedureType"
|
||||
component={RenderPickList}
|
||||
@@ -209,7 +210,7 @@ let S78_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -224,7 +225,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="enterNeighbouringLandToViewSite"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="enterNeighbouringLandToViewSite"
|
||||
className="govuk-radios__input"
|
||||
@@ -253,7 +254,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="enterNeighbouringLandAccessRequired"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="enterNeighbouringLandAccessRequired"
|
||||
className="govuk-radios__input"
|
||||
@@ -282,7 +283,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="healthAndSafetyIssues"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="healthAndSafetyIssues"
|
||||
className="govuk-radios__input"
|
||||
@@ -405,7 +406,7 @@ let S78_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -434,7 +435,7 @@ let S78_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -450,7 +451,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="ROW"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="ROW"
|
||||
className="govuk-radios__input"
|
||||
@@ -477,7 +478,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="conservationArea"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="conservationArea"
|
||||
className="govuk-radios__input"
|
||||
@@ -504,7 +505,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="affectListedBuilding"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="affectListedBuilding"
|
||||
className="govuk-radios__input"
|
||||
@@ -531,7 +532,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="TPO"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="TPO"
|
||||
className="govuk-radios__input"
|
||||
@@ -558,7 +559,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="natureConservationSite"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="natureConservationSite"
|
||||
className="govuk-radios__input"
|
||||
@@ -585,7 +586,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="protectedSpecies"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="protectedSpecies"
|
||||
className="govuk-radios__input"
|
||||
@@ -616,7 +617,7 @@ let S78_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -629,7 +630,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="governmentDepartmentComments"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="governmentDepartmentComments"
|
||||
className="govuk-radios__input"
|
||||
@@ -675,7 +676,7 @@ let S78_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -691,7 +692,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="developmentCarriedOutInAccordance"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="developmentCarriedOutInAccordance"
|
||||
className="govuk-radios__input"
|
||||
@@ -722,7 +723,7 @@ let S78_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -741,7 +742,7 @@ let S78_Questionnaire = (props) => {
|
||||
component={RenderRadioList}
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
type="text"
|
||||
rows="5"
|
||||
@@ -757,7 +758,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="developmentAnyOtherConditions"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="developmentAnyOtherConditions"
|
||||
className="govuk-radios__input"
|
||||
@@ -797,7 +798,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="copyOfApplicantsCertificate"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="copyOfApplicantsCertificate"
|
||||
className="govuk-radios__input"
|
||||
@@ -825,7 +826,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="advertismentGiven"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="advertismentGiven"
|
||||
className="govuk-radios__input"
|
||||
@@ -853,7 +854,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="copyOfLetterOfAppealNotification"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="copyOfLetterOfAppealNotification"
|
||||
className="govuk-radios__input"
|
||||
@@ -880,7 +881,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="lpaEIAOS"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="lpaEIAOS"
|
||||
className="govuk-radios__input"
|
||||
@@ -907,7 +908,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="advertismentConsentDiscontinuanceNotice"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="advertismentConsentDiscontinuanceNotice"
|
||||
className="govuk-radios__input"
|
||||
@@ -934,7 +935,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="detailsOfOtherAppeals"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="detailsOfOtherAppeals"
|
||||
className="govuk-radios__input"
|
||||
@@ -961,7 +962,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="detailsOfPreviousAppeals"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="detailsOfPreviousAppeals"
|
||||
className="govuk-radios__input"
|
||||
@@ -988,7 +989,7 @@ let S78_Questionnaire = (props) => {
|
||||
datafieldname="otherRelevantInformation"
|
||||
options={[
|
||||
t("myrepresentations:questionnaire-yes"),
|
||||
t("myrepresentations:questionnaire-no"),
|
||||
t("myrepresentations:questionnaire-no")
|
||||
]}
|
||||
id="otherRelevantInformation"
|
||||
className="govuk-radios__input"
|
||||
@@ -1120,7 +1121,7 @@ S78_Questionnaire = connect((state) => {
|
||||
|
||||
return {
|
||||
procedureTypeValue,
|
||||
representationTypeValue,
|
||||
representationTypeValue
|
||||
};
|
||||
})(S78_Questionnaire);
|
||||
|
||||
@@ -1131,7 +1132,7 @@ const mapDispatchToProps = (dispatch) => {
|
||||
|
||||
setFilesForRepresentations: (fileList) => {
|
||||
dispatch(setFilesForRepresentations(fileList));
|
||||
},
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1143,7 +1144,7 @@ const mapStateToProps = (state, props) => {
|
||||
appealType: state.appealType,
|
||||
currentView: state.currentView,
|
||||
myRepresentations: state.myRepresentations,
|
||||
initialValues: state.currentView.caseReference.repDetails,
|
||||
initialValues: state.currentView.caseReference.repDetails
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1154,6 +1155,6 @@ export default connect(
|
||||
reduxForm({
|
||||
form: "representationForm",
|
||||
enableReinitialize: false,
|
||||
destroyOnUnmount: false,
|
||||
destroyOnUnmount: false
|
||||
})(S78_Questionnaire)
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user