updated the documents query and display

This commit is contained in:
2021-09-27 16:46:39 +01:00
parent 0c2c0ebfb4
commit 27915a523d
7 changed files with 731 additions and 606 deletions
+44 -69
View File
@@ -210,31 +210,16 @@ const CaseSummary = (props) => {
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
detailsObj[
casesObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: detailsObj[
: casesObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || ""}
</dd>
</div>
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-summary-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_casedescription"
)
? detailsObj.pinswg_casedescription
: ""}
</dd>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
@@ -246,10 +231,12 @@ const CaseSummary = (props) => {
{/* {casesObj.caseDetails.caseOfficer ||
""} */}
{_.has(
detailsObj,
"pinswg_casedescription"
casesObj,
"_ownerid_value"
)
? detailsObj.pinswg_casedescription
? casesObj[
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
]
: ""}
</dd>
</div>
@@ -377,11 +364,11 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_startdate@OData.Community.Display.V1.FormattedValue"
"pinswg_startdate"
)
? detailsObj[
"pinswg_startdate@OData.Community.Display.V1.FormattedValue"
]
? formatDates(
detailsObj.pinswg_startdate
)
: t(
"case:summary-no-date-entered-label"
)}
@@ -397,11 +384,11 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_questionnaireduedate@OData.Community.Display.V1.FormattedValue"
"pinswg_questionnaireduedate"
)
? detailsObj[
"pinswg_questionnaireduedate@OData.Community.Display.V1.FormattedValue"
]
? formatDates(
detailsObj.pinswg_questionnaireduedate
)
: t(
"case:summary-no-date-entered-label"
)}
@@ -417,11 +404,11 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_statementduedate@OData.Community.Display.V1.FormattedValue"
"pinswg_statementduedate"
)
? detailsObj[
"pinswg_statementduedate@OData.Community.Display.V1.FormattedValue"
]
? formatDates(
detailsObj.pinswg_statementduedate
)
: t(
"case:summary-no-date-entered-label"
)}
@@ -437,11 +424,11 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_otherpartiesstatement@OData.Community.Display.V1.FormattedValue"
"pinswg_otherpartiesstatement"
)
? detailsObj[
"pinswg_otherpartiesstatement@OData.Community.Display.V1.FormattedValue"
]
? formatDates(
detailsObj.pinswg_otherpartiesstatement
)
: t(
"case:summary-no-date-entered-label"
)}
@@ -457,37 +444,16 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue"
"pinswg_finalcommentsduedate"
)
? detailsObj[
"pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue"
]
? formatDates(
detailsObj.pinswg_finalcommentsduedate
)
: t(
"case:summary-no-date-entered-label"
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue"
)
? detailsObj[
"pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue"
]
: t(
"case:summary-no-date-entered-label"
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
@@ -497,11 +463,11 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_dateeventrequested@OData.Community.Display.V1.FormattedValue"
"pinswg_dateeventrequested"
)
? detailsObj[
"pinswg_dateeventrequested@OData.Community.Display.V1.FormattedValue"
]
? formatDates(
detailsObj.pinswg_dateeventrequested
)
: t(
"case:summary-no-date-entered-label"
)}
@@ -517,11 +483,11 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_dateoflpadecision@OData.Community.Display.V1.FormattedValue"
"pinswg_dateoflpadecision"
)
? detailsObj[
"pinswg_dateoflpadecision@OData.Community.Display.V1.FormattedValue"
]
? formatDates(
detailsObj.pinswg_dateoflpadecision
)
: t(
"case:summary-no-date-entered-label"
)}
@@ -582,6 +548,15 @@ const CaseSummary = (props) => {
: setShowSpinnerState(true);
};
function formatDates(dateObj) {
var dateObj = new Date(dateObj);
var dd = String(dateObj.getDate()).padStart(2, "0");
var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0!
var yyyy = dateObj.getFullYear();
return dd + "/" + mm + "/" + yyyy;
}
return (
<>
{showDetailsBlock}