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

pass in locale to questionnaire for welsh version

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