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

logic to show site address as project location

Browse Source
This commit is contained in:
robbond
2022-03-15 14:32:12 +00:00
parent d786c5b1a6
commit 2126fa9630
7 changed files with 84 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/summary.js
+17
View File
@@ -162,6 +162,23 @@ const CaseSummary = (props) => {
{t("case:summary-site-address-label")}
</dt>
<dd className="govuk-summary-list__value">
{getFormCollectionByID(appealTypeID)
.PrimaryIdAttribute == "pinswg_dnsid"
? detailsObj.pinswg_projectlocation !=
null
? detailsObj.pinswg_projectlocation.indexOf(
";"
) < 0
? detailsObj.pinswg_projectlocation
: router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""
: ""}
{_.has(
detailsObj,
"pinswg_siteaddressline1"
components/case/summaryTypes/pinswg_dnsid.js
+3 -4
View File
@@ -12,8 +12,7 @@ const Pinswg_dnsid = (props) => {
const { locale } = router;
return (
<>
{detailsObj.pinswg_projectdescription != null ||
detailsObj.pinswg_projectlocation != null ? (
{detailsObj.pinswg_projectdescription != null ? (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
@@ -36,7 +35,7 @@ const Pinswg_dnsid = (props) => {
: ""}
</p>
<p className="govuk-body">
{/* <p className="govuk-body">
{detailsObj.pinswg_projectlocation != null
? detailsObj.pinswg_projectlocation.indexOf(
";"
@@ -50,7 +49,7 @@ const Pinswg_dnsid = (props) => {
";"
)[0]
: ""}
</p>
</p> */}
</div>
</div>
</div>
components/myportal/viewall.js
+14
View File
@@ -121,6 +121,20 @@ const ViewAllResults = (props) => {
<span className="results-visually-hidden">
{t("search:searchresults-site-address-label")}:
</span>
{getFormCollectionByID(appealTypeID).PrimaryIdAttribute ==
"pinswg_dnsid"
? detailsObj.pinswg_projectlocation != null
? detailsObj.pinswg_projectlocation.indexOf(";") < 0
? detailsObj.pinswg_projectlocation
: router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""
: ""}
{_.has(detailsObj, "pinswg_siteaddressline1")
? detailsObj.pinswg_siteaddressline1
: ""}
components/search/dnssearchresults.js
+20
View File
@@ -179,6 +179,26 @@ const DNSSearchResults = (props) => {
)}
:
</span>
{_.has(
detailsObj,
"pinswg_projectlocation"
)
? detailsObj.pinswg_projectlocation !=
null
? detailsObj.pinswg_projectlocation.indexOf(
";"
) < 0
? detailsObj.pinswg_projectlocation
: router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""
: ""}
{_.has(
detailsObj,
"pinswg_siteaddressline1"
components/search/searchresults.js
+19
View File
@@ -301,6 +301,25 @@ const SearchResults = (props) => {
)}
:
</span>
{_.has(
detailsObj,
"pinswg_projectlocation"
)
? detailsObj.pinswg_projectlocation !=
null
? detailsObj.pinswg_projectlocation.indexOf(
";"
) < 0
? detailsObj.pinswg_projectlocation
: router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""
: ""}
{_.has(
detailsObj,
"pinswg_siteaddressline1"