Merged PR 1499: SIPS Sprint 3 14760 tabs ui
Related work items: #14758, #15079
This commit is contained in:
Robert Bond
@@ -75,7 +75,7 @@ export const getSelectQuery = (appealTypeName) => {
|
||||
break;
|
||||
case "pinswg_sipses":
|
||||
// return "&$select=pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_choiceofprocedure,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofdecision,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_casestage,_pinswg_dnsids_value,pinswg_startdateofevent,pinswg_typeofevent";
|
||||
return "&$select=pinswg_anticipatedgridrefeasting,pinswg_anticipatedgridrefnorthing,_pinswg_appellant_value,pinswg_name,_pinswg_associatedlpa_value,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,statuscode,pinswg_casestage,_pinswg_sipscase_value,pinswg_writtenacceptanceofnotification,pinswg_validnoticeofintentiontosubmit,pinswg_deadlineforsubmissionofapplication,pinswg_screeningstartdate,pinswg_eiatargetdate,pinswg_targetextended,pinswg_directionissueddate,pinswg_eiarequired,pinswg_scopingstartdate,pinswg_scopingtargetdate,pinswg_scopingtargetextended,pinswg_scopingoutcomeissueddate";
|
||||
return "&$select=pinswg_eiarequired,pinswg_anticipatedgridrefeasting,pinswg_anticipatedgridrefnorthing,_pinswg_appellant_value,pinswg_name,_pinswg_associatedlpa_value,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,statuscode,pinswg_casestage,_pinswg_sipscase_value,pinswg_writtenacceptanceofnotification,pinswg_validnoticeofintentiontosubmit,pinswg_deadlineforsubmissionofapplication,pinswg_screeningstartdate,pinswg_eiatargetdate,pinswg_targetextended,pinswg_directionissueddate,pinswg_eiarequired,pinswg_scopingstartdate,pinswg_scopingtargetdate,pinswg_scopingtargetextended,pinswg_scopingoutcomeissueddate";
|
||||
break;
|
||||
default:
|
||||
return "";
|
||||
|
||||
@@ -33,8 +33,7 @@ const EventsDetails = (props) => {
|
||||
<h2 className="govuk-heading-m ">Events</h2>
|
||||
{eventsArr.map(
|
||||
(item, key) =>
|
||||
item.pinswg_eventpublishingflag ==
|
||||
846040001 && (
|
||||
item.pinswg_eventpublishflag && (
|
||||
<>
|
||||
{" "}
|
||||
<div className="eventContainer">
|
||||
|
||||
+984
-523
File diff suppressed because it is too large
Load Diff
@@ -10,32 +10,12 @@ import OSPoint from "ospoint";
|
||||
|
||||
const Pinswg_sipscase = (props) => {
|
||||
let { t } = useTranslation();
|
||||
const { casesObj, detailsObj, formatDates, linkedCasesList, showMap } =
|
||||
props;
|
||||
const { casesObj, detailsObj, formatDates, linkedCasesList } = props;
|
||||
|
||||
const router = useRouter();
|
||||
const { locale } = router;
|
||||
let point = {};
|
||||
let siteCoords = {};
|
||||
let center = {};
|
||||
|
||||
point = new OSPoint(
|
||||
detailsObj.pinswg_anticipatedgridrefnorthing,
|
||||
detailsObj.pinswg_anticipatedgridrefeasting
|
||||
);
|
||||
siteCoords = point.toOSGB36();
|
||||
//console.log(siteCoords);
|
||||
center = {
|
||||
id: "",
|
||||
lat: isNaN(parseFloat(siteCoords.latitude))
|
||||
? 52.412272
|
||||
: parseFloat(siteCoords.latitude),
|
||||
lng: isNaN(parseFloat(siteCoords.longitude))
|
||||
? -3.437989
|
||||
: parseFloat(siteCoords.longitude),
|
||||
};
|
||||
|
||||
const zoom = isNaN(parseFloat(siteCoords.latitude)) ? 7 : 12;
|
||||
|
||||
function hasValidKey(obj, key) {
|
||||
return (
|
||||
@@ -51,13 +31,7 @@ const Pinswg_sipscase = (props) => {
|
||||
{detailsObj.pinswg_projectdescription != null ? (
|
||||
<div className="govuk-grid-row">
|
||||
<div className="flex-container grid-row govuk-body case">
|
||||
<div
|
||||
className={
|
||||
showMap == "true"
|
||||
? "govuk-grid-column-one-half"
|
||||
: "govuk-grid-column-full"
|
||||
}
|
||||
>
|
||||
<div className={"govuk-grid-column-full"}>
|
||||
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
|
||||
{t("case:summary-project-details-label")}
|
||||
</h2>
|
||||
@@ -93,22 +67,6 @@ const Pinswg_sipscase = (props) => {
|
||||
: ""}
|
||||
</p> */}
|
||||
</div>
|
||||
{showMap == "true" && (
|
||||
<div className="govuk-grid-column-one-half">
|
||||
<div
|
||||
style={{
|
||||
height: "40vh",
|
||||
width: "100%",
|
||||
}}
|
||||
>
|
||||
<GoogleMapComponent
|
||||
center={center}
|
||||
zoom={zoom}
|
||||
/>
|
||||
{/* <OSMapComponent center={center} zoom={zoom} /> */}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
@@ -235,6 +193,30 @@ const Pinswg_sipscase = (props) => {
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t(
|
||||
"case:summary-eia-required-label"
|
||||
)}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{router.locale == "cy"
|
||||
? jsonpath(
|
||||
'$..[?(@.value=="' +
|
||||
detailsObj[
|
||||
"pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
|
||||
] +
|
||||
'")].value_cy',
|
||||
transLookup
|
||||
)
|
||||
: detailsObj[
|
||||
"pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
|
||||
] ||
|
||||
t(
|
||||
"case:summary-to-be-confirmed-label"
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
{/* <div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("case:summary-status-label")}
|
||||
@@ -762,7 +744,6 @@ const Pinswg_sipscase = (props) => {
|
||||
"case:summary-awaiting-information-label"
|
||||
)}
|
||||
</dd>
|
||||
)
|
||||
</div>
|
||||
)}
|
||||
<div className="govuk-summary-list__row">
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
"summary-type-of-event-label": "Math o ddigwyddiad",
|
||||
"summary-status-label": "Statws",
|
||||
"summary-decision-label": "Penderfyniad",
|
||||
"summary-eia-required-label": "Angen AEA",
|
||||
"summary-case-link-status-label": "Statws Cysylltiad yr Achos",
|
||||
"summary-case-link-status-not-linked": "Heb ei gysylltu",
|
||||
"summary-case-link-status-linked": "Wedi'i gysylltu",
|
||||
|
||||
@@ -45,6 +45,7 @@
|
||||
"summary-start-event-time-label": "Start time of event",
|
||||
"summary-event-date-label": "Event Date",
|
||||
"summary-decision-date-label": "Decision Date",
|
||||
"summary-eia-required-label": "EIA required",
|
||||
"summary-documents-button-label": "Documents",
|
||||
"documents-not-available-label": "Documents are not available for download at this time, please check later.",
|
||||
"documents-document-count-label": "Document(s)",
|
||||
|
||||
@@ -65,6 +65,11 @@ h5,
|
||||
height: 1.8rem;
|
||||
}
|
||||
|
||||
.govuk-tabs__panel .govuk-grid-row {
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
background-color: #ffffff;
|
||||
|
||||
Reference in New Issue
Block a user