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

Merged PR 1147: display correct label when no data for decision

Browse Source 
Related work items: #11137
This commit is contained in:
Robert Bond
2024-05-13 15:55:16 +00:00
parent c94e61196a 2722d472e3
commit 5987ecacf2
33 changed files with 135 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/summary.js
+3
View File
@@ -582,6 +582,9 @@ const CaseSummary = (props) => {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
{_.has(detailsObj, "pinswg_startdate") && {_.has(detailsObj, "pinswg_startdate") &&
(detailsObj.pinswg_startdate != null ||
detailsObj.pinswg_finalcommentsduedate !=
null) &&
showRepsEnded( showRepsEnded(
detailsObj.pinswg_startdate, detailsObj.pinswg_startdate,
detailsObj.pinswg_finalcommentsduedate detailsObj.pinswg_finalcommentsduedate
components/case/summaryTypes/pinswg_advertsid.js
+2 -1
View File
@@ -137,6 +137,7 @@ const Pinswg_advertsid = (props) => {
)} )}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-decision-label")} {t("case:summary-decision-label")}
@@ -155,7 +156,7 @@ const Pinswg_advertsid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_callinss77id.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_callinss77id = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_commonlandid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_commonlandid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
+1 -1
View File
@@ -137,7 +137,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_environmentalpermittingid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_environmentalpermittingid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_harbourrevisionorderid.js
+1 -1
View File
@@ -176,7 +176,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_householderappealhasid.js
+1 -1
View File
@@ -136,7 +136,7 @@ const Pinswg_householderappealhasid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_ldpid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_ldpid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_maintenanceoflands217id.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_nonvalidationid.js
+1 -1
View File
@@ -136,7 +136,7 @@ const Pinswg_nonvalidationid = (props) => {
"pinswg_decisionissued@OData.Community.Display.V1.FormattedValue" "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_planningappeals78id.js
+5 -2
View File
@@ -112,7 +112,10 @@ const Pinswg_planningappeals78id = (props) => {
) )
: detailsObj[ : detailsObj[
"pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
] || ""} ] ||
t(
"case:summary-no-information-to-date-label"
)}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -155,7 +158,7 @@ const Pinswg_planningappeals78id = (props) => {
"pinswg_dicision@OData.Community.Display.V1.FormattedValue" "pinswg_dicision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_planningconditionss73s79id.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_planningobligationappeals106id.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_rowid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_rowid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/case/summaryTypes/pinswg_wayleaveid.js
+1 -1
View File
@@ -155,7 +155,7 @@ const Pinswg_wayleaveid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-information-to-date-label"
)} )}
<br /> <br />
components/homepage/login.js
+1 -206
View File
@@ -5,7 +5,6 @@ import useTranslation from "next-translate/useTranslation";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Field, reduxForm } from "redux-form"; import { Field, reduxForm } from "redux-form";
import { getLogin } from "../../actions";
import { setLoggedInUserId } from "../../store/accountDetails/action"; import { setLoggedInUserId } from "../../store/accountDetails/action";
import { parseCookies, setCookie, destroyCookie } from "nookies"; import { parseCookies, setCookie, destroyCookie } from "nookies";
@@ -19,102 +18,6 @@ export const minLength = (errorMsg) => (value) =>
? errorMsg //`Must be ${min} characters or more` ? errorMsg //`Must be ${min} characters or more`
: undefined; : undefined;
const RenderTextfield = ({
id,
className,
rows,
datafieldname,
name,
label,
input,
hint1,
hint2,
meta: { touched, error },
...custom
}) => {
return (
<>
<div
className={
touched && error
? "govuk-form-group govuk-form-group--error"
: "govuk-form-group "
}
>
<div id="basicSearch-hint" className="govuk-hint ">
<span className="govuk-body-m">{hint1}</span>
<br />
<span className="govuk-body-s">{hint2}</span>
</div>
<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>{" "}
{error}
</span>
)}
<input
{...input}
className={className}
name={name}
id={id}
autoComplete="username"
/>
</div>
</>
);
};
const RenderPasswordfield = ({
id,
className,
rows,
datafieldname,
name,
label,
input,
hint1,
hint2,
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>
<div id="basicSearch-hint" className="govuk-hint ">
<span className="govuk-body-m">{hint1}</span>
</div>
{touched && error && (
<span id={id + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
{error}
</span>
)}
<input
{...input}
type="password"
className={className}
name={name}
id={id}
autoComplete="current-password"
/>
</div>
</>
);
};
let Login = (props) => { let Login = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
const { handleSubmit, pristine, reset, submitting, setLoggedInUserId } = const { handleSubmit, pristine, reset, submitting, setLoggedInUserId } =
@@ -134,32 +37,6 @@ let Login = (props) => {
// : setShowSpinnerState(true); // : setShowSpinnerState(true);
// }; // };
const onHandleSubmit = (values) => {
//spinnerState();
let now = new Date();
let expDate = new Date(now);
expDate.setDate(now.getDate() + 1);
getLogin(values.loginUserID, values.loginUserPassword).then((data) => {
data.value.length != 0
? (setValidLoginID(true),
setLoggedInUserId(data.value[0].contactid),
setCookie(null, "pinsUser", data.value[0].contactid, {
path: "/",
expires: expDate,
}),
// spinnerState(),
router.replace({
pathname:
router.locale == "cy" ? "/fymhorth" : "/myportal",
}))
: //setShowSpinnerState(false),
setValidLoginID(false);
});
};
const cookies = parseCookies(); const cookies = parseCookies();
useEffect(() => { useEffect(() => {
@@ -241,81 +118,7 @@ let Login = (props) => {
<p className="govuk-body-s"> <p className="govuk-body-s">
{t("home:login-comingsoon-temp-1a")}{" "} {t("home:login-comingsoon-temp-1a")}{" "}
</p> </p>
{/* <form onSubmit={handleSubmit(onHandleSubmit)}>
{validLoginID == false && (
<div className="govuk-error-message govuk-form-group--error">
Incorrect username or password
</div>
)}
<Field
// validate={[
// required(
// t("home:casesearch-search-validation-required")
// ),
// minLength(
// t("home:casesearch-search-validation-minlength")
// ),
// ]}
className="govuk-input"
component={RenderTextfield}
id="loginUserID"
name="loginUserID"
type="text"
aria-describedby="basicSearch-hint"
hint1={t("home:login-card-id-label")}
label={t("home:login-card-id-hint")}
/>
<Field
className="govuk-input"
component={RenderPasswordfield}
id="loginUserPassword"
name="loginUserPassword"
type="password"
label="Password"
/>
<div className="govuk-form-group">
<button type="submit" className="govuk-button">
{t("home:login-card-button")}
</button>
</div>
</form> */}
<div className="govuk-form-group govuk-!-margin-top-4"> <div className="govuk-form-group govuk-!-margin-top-4">
{/* <p className="govuk-body-xs">
<a
onClick={() => {
govGatwayLoginRedirect();
}}
className="govuk-button withChevron govuk-button-cta"
>
{t("home:login-via-gov-gateway-label")}
</a>
</p>
<p className="govuk-body-s">
{t("home:login-card-register-label")}{" "}
<a
href={
router.locale == "cy"
? "https://www.ete.access.service.gov.uk/login/create-account?lang=cy"
: "https://www.ete.access.service.gov.uk/login/create-account"
}
className="govuk-link--no-underline"
>
{t("home:login-card-register-link")}
</a>
</p>
*/}
{/* <p className="govuk-body-s">
<a
onClick={() => {
govGatwayForgottenLink();
}}
className="govuk-link--no-underline"
>
{t("home:login-card-forgotten-label")}{" "}
</a>
</p> */}
<hr className="govuk-!-margin-bottom-4" /> <hr className="govuk-!-margin-bottom-4" />
<p className="govuk-body-s"> <p className="govuk-body-s">
{t("home:login-comingsoon-temp-2")} {t("home:login-comingsoon-temp-2")}
@@ -414,12 +217,4 @@ const mapDispatchToProps = (dispatch) => {
}; };
}; };
export default connect( export default connect(mapStateToProps, mapDispatchToProps)(Login);
mapStateToProps,
mapDispatchToProps
)(
reduxForm({
form: "loginForm",
destroyOnUnmount: false,
})(Login)
);
components/pdftemplates/appealRow_pdf.js
+3 -6
View File
@@ -348,12 +348,9 @@ export const AppealRow_pdf = (props) => {
} }
> >
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {props.props[
props.props[ datafieldname[0].value
datafieldname[0] ] || ""}{" "}
.value
]
}{" "}
</Html> </Html>
</View> </View>
</View> </View>
components/pdftemplates/enforcement_pdf.js
+51 -58
View File
@@ -247,7 +247,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
"Written representations" && ( "Written representations" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.procedureTypeEvidence} {values.procedureTypeEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -298,9 +298,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
"Yes" && ( "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={{ fontSize: 12 }}> <Html style={{ fontSize: 12 }}>
{ {values.enterNeighbouringLandToViewSiteEvidence ||
values.enterNeighbouringLandToViewSiteEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -338,9 +337,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
"Yes" && ( "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.enterNeighbouringLandAccessRequiredEvidence ||
values.enterNeighbouringLandAccessRequiredEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -372,9 +370,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.healthAndSafetyIssues == "Yes" && ( {values.healthAndSafetyIssues == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.healthAndSafetyIssuesEvidence ||
values.healthAndSafetyIssuesEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -402,7 +399,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
</View> </View>
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.LPAcontactDetails} {values.LPAcontactDetails || ""}
</Html> </Html>
</View> </View>
</View> </View>
@@ -475,7 +472,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.feeExempt == "Yes" && ( {values.feeExempt == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.feeExemptEvidence} {values.feeExemptEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -516,7 +513,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.previousGrantedCerts == "Yes" && ( {values.previousGrantedCerts == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.previousGrantedCertsEvidence} {values.previousGrantedCertsEvidence ||
""}
</Html> </Html>
</View> </View>
)} )}
@@ -539,7 +537,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.stopNoticeServed == "Yes" && ( {values.stopNoticeServed == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.stopNoticeServedEvidence} {values.stopNoticeServedEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -564,7 +562,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.relatedCases == "Yes" && ( {values.relatedCases == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.relatedCasesEvidence} {values.relatedCasesEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -587,7 +585,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.previousEnforcement == "Yes" && ( {values.previousEnforcement == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.previousEnforcementEvidence} {values.previousEnforcementEvidence ||
""}
</Html> </Html>
</View> </View>
)} )}
@@ -610,7 +609,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.subjectArticle4 == "Yes" && ( {values.subjectArticle4 == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.subjectArticle4Evidence} {values.subjectArticle4Evidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -634,7 +633,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.previousPDRRestriction == "Yes" && ( {values.previousPDRRestriction == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.previousPDRRestrictionEvidence} {values.previousPDRRestrictionEvidence ||
""}
</Html> </Html>
</View> </View>
)} )}
@@ -667,7 +667,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
</Text> </Text>
<View style={styles.questionAnswer}> <View style={styles.questionAnswer}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.LPAldpAndMap} {values.LPAldpAndMap || ""}
</Html> </Html>
</View> </View>
</View> </View>
@@ -685,7 +685,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
</Text> </Text>
<View style={styles.questionAnswer}> <View style={styles.questionAnswer}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.LPAlocalGuidance} {values.LPAlocalGuidance || ""}
</Html> </Html>
</View> </View>
</View> </View>
@@ -761,7 +761,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.ROW == "Yes" && ( {values.ROW == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.ROWEvidence} {values.ROWEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -792,7 +792,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.conservationArea == "Yes" && ( {values.conservationArea == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.conservationAreaEvidence} {values.conservationAreaEvidence ||
""}
</Html> </Html>
</View> </View>
)} )}
@@ -825,9 +826,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.affectListedBuilding == "Yes" && ( {values.affectListedBuilding == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.affectListedBuildingEvidence ||
values.affectListedBuildingEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -858,7 +858,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.TPO == "Yes" && ( {values.TPO == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.TPOEvidence} {values.TPOEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -891,9 +891,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.natureConservationSite == "Yes" && ( {values.natureConservationSite == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.natureConservationSiteEvidence ||
values.natureConservationSiteEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -924,7 +923,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.protectedSpecies == "Yes" && ( {values.protectedSpecies == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.protectedSpeciesEvidence} {values.protectedSpeciesEvidence ||
""}
</Html> </Html>
</View> </View>
)} )}
@@ -971,7 +971,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.floodingIssue == "Yes" && ( {values.floodingIssue == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.floodingIssueEvidence} {values.floodingIssueEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -1006,9 +1006,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
"Yes" && ( "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.governmentDepartmentCommentsEvidence ||
values.governmentDepartmentCommentsEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -1078,9 +1077,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
"Yes" && ( "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.developmentCarriedOutInAccordanceEvidence ||
values.developmentCarriedOutInAccordanceEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -1161,9 +1159,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
"Yes" && ( "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.developmentAnyOtherConditionsEvidence ||
values.developmentAnyOtherConditionsEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -1207,7 +1204,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
</View> </View>
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.copyOfEnforcementNoticeEvidence} {values.copyOfEnforcementNoticeEvidence ||
""}
</Html> </Html>
</View> </View>
</View> </View>
@@ -1237,7 +1235,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.enforcementNoticePlan} {values.enforcementNoticePlan || ""}
</Html> </Html>
</View> </View>
</View> </View>
@@ -1267,9 +1265,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
</View> </View>
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.listOfNotifiedOfEnforcementEvidence ||
values.listOfNotifiedOfEnforcementEvidence ""}
}
</Html> </Html>
</View> </View>
</View> </View>
@@ -1301,9 +1298,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
</View> </View>
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.copyOfLetterOfAppealNotificationEvidence ||
values.copyOfLetterOfAppealNotificationEvidence ""}
}
</Html> </Html>
</View> </View>
</View> </View>
@@ -1335,7 +1331,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.lpaEIAOS == "Yes" && ( {values.lpaEIAOS == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.lpaEIAOSEvidence} {values.lpaEIAOSEvidence || ""}
</Html> </Html>
</View> </View>
)} )}
@@ -1368,9 +1364,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.detailsOfOtherAppeals == "Yes" && ( {values.detailsOfOtherAppeals == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.detailsOfOtherAppealsEvidence ||
values.detailsOfOtherAppealsEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -1403,9 +1398,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.detailsOfPreviousAppeals == "Yes" && ( {values.detailsOfPreviousAppeals == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.detailsOfPreviousAppealsEvidence ||
values.detailsOfPreviousAppealsEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
@@ -1437,9 +1431,8 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
{values.otherRelevantInformation == "Yes" && ( {values.otherRelevantInformation == "Yes" && (
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.otherRelevantInformationEvidence ||
values.otherRelevantInformationEvidence ""}
}
</Html> </Html>
</View> </View>
)} )}
components/pdftemplates/finalComments_pdf.js
+3 -4
View File
@@ -226,9 +226,8 @@ export const finalComments_pdf = ({ docProps }) => {
</Text> </Text>
<Text style={styles.questionAnswer}> <Text style={styles.questionAnswer}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.conditional_representationCapacity_Comments ||
values.conditional_representationCapacity_Comments ""}
}
</Html> </Html>
</Text> </Text>
</View> </View>
@@ -319,7 +318,7 @@ export const finalComments_pdf = ({ docProps }) => {
</View> </View>
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.representationComments} {values.representationComments || ""}
</Html> </Html>
</View> </View>
</View> </View>
components/pdftemplates/other_pdf.js
+1 -1
View File
@@ -245,7 +245,7 @@ export const other_pdf = ({ docProps }) => {
</View> </View>
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.representationComments} {values.representationComments || ""}
</Html> </Html>
</View> </View>
</View> </View>
components/pdftemplates/statement_pdf.js
+2 -3
View File
@@ -224,9 +224,8 @@ export const statement_pdf = ({ docProps }) => {
</Text> </Text>
<Text style={styles.questionAnswer}> <Text style={styles.questionAnswer}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{ {values.conditional_representationCapacity_Comments ||
values.conditional_representationCapacity_Comments ""}
}
</Html> </Html>
</Text> </Text>
</View> </View>
components/pdftemplates/writtenStatement_pdf.js
+1 -1
View File
@@ -238,7 +238,7 @@ export const writtenStatement_pdf = ({ docProps }) => {
</View> </View>
<View style={styles.questionAnswerWide}> <View style={styles.questionAnswerWide}>
<Html style={styles.richArea}> <Html style={styles.richArea}>
{values.representationComments} {values.representationComments || ""}
</Html> </Html>
</View> </View>
</View> </View>
pages/api/endpoint/getawaitingsubmission_api.js
+7
View File
@@ -5,6 +5,13 @@
* tags: [Case] * tags: [Case]
* summary: Phase 2 * summary: Phase 2
* description: get awaiting case submission * description: get awaiting case submission
* parameters:
* - name: loggedInUserId
* in: query
* required: true
* example: 9c563a87-4158-ec11-a9c6-002248008e24
* schema:
* type: string
* responses: * responses:
* 200: * 200:
* description: Success * description: Success
pages/api/endpoint/getemailaccountcheck_api.js
+17
View File
@@ -1,3 +1,20 @@
/**
* @swagger
* /api/endpoint/getemailaccountcheck_api:
* get:
* tags: [Login]
* description: Returns portal login
* summary: Phase 2
* parameters:
* - name: emailAddress
* in: query
* required: true
* schema:
* type: string
* responses:
* 200:
* description: hello world
*/
import axios from "axios"; import axios from "axios";
import CryptoJS from "crypto-js"; import CryptoJS from "crypto-js";
import _ from "lodash"; import _ from "lodash";
pages/api/endpoint/getpicklists_api.js
+19
View File
@@ -1,3 +1,22 @@
/**
* @swagger
* /api/endpoint/getpicklists_api:
* get:
* tags: [Case]
* description: Returns picklists for appeal tpyes
* summary: Phase 2
* parameters:
* - name: whichForm
* in: query
* required: true
* example: planningappeals78
* schema:
* type: string
* responses:
* 200:
* description: hello world
*/
import axios from "axios"; import axios from "axios";
import CryptoJS from "crypto-js"; import CryptoJS from "crypto-js";
import { getToken, azureHeaders, consoleLogger } from "../../../actions"; import { getToken, azureHeaders, consoleLogger } from "../../../actions";