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

apostrophe fix and dns details ordering

Browse Source
This commit is contained in:
robbond
2022-04-26 16:08:23 +01:00
parent 1fae028486
commit 19be69389e
15 changed files with 381 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/search/dnssearchresults.js
+40 -32
View File
@@ -53,6 +53,7 @@ const DNSSearchResults = (props) => {
watchedCases,
setWatchedCases,
setWatchedCasesDetails,
showMap,
} = props;
let { t } = useTranslation();
@@ -302,9 +303,9 @@ const DNSSearchResults = (props) => {
resultsArr.map((item, key) => {
let detailsObj = jsonpath.query(
searchDetailsObj,
"$..value[?(@.pinswg_name=='" +
'$..value[?(@.pinswg_name=="' +
item.title +
"')]"
'")]'
);
detailsObj = detailsObj[0];
@@ -339,6 +340,7 @@ const DNSSearchResults = (props) => {
item.incidentid,
"appealType":
item.pinswg_appealcasetype,
"showMap": showMap,
});
}}
>
@@ -619,7 +621,13 @@ const DNSSearchResults = (props) => {
<>
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-one-half">
<div
className={
showMap == "true"
? "govuk-grid-column-one-half"
: "govuk-grid-column-two-thirds"
}
>
<h1 className="govuk-heading-l">
{t("dnsApplications:page-title")}
</h1>
@@ -644,37 +652,37 @@ const DNSSearchResults = (props) => {
</ul>
</div>
{/* {process.env.SHOWMAPS == "true" && ( */}
<div className="govuk-grid-column-one-half">
<div
style={{
height: "45vh",
width: "100%",
}}
>
<GoogleMapReact
options={function (maps) {
return {
overviewMapControl: true,
mapTypeControl: true,
};
{showMap == "true" && (
<div className="govuk-grid-column-one-half">
<div
style={{
height: "45vh",
width: "100%",
}}
bootstrapURLKeys={{
key: "AIzaSyCzeVrHt544bp_72YCFkw21eDsmI2JEsQo",
}}
defaultCenter={{
id: "",
lat: 52.412272,
lng: -3.437989,
}}
defaultZoom={7}
onGoogleApiLoaded={({ map, maps }) =>
ModelsMap(map, maps)
}
/>
>
<GoogleMapReact
options={function (maps) {
return {
overviewMapControl: true,
mapTypeControl: true,
};
}}
bootstrapURLKeys={{
key: "AIzaSyCzeVrHt544bp_72YCFkw21eDsmI2JEsQo",
}}
defaultCenter={{
id: "",
lat: 52.412272,
lng: -3.437989,
}}
defaultZoom={7}
onGoogleApiLoaded={({ map, maps }) =>
ModelsMap(map, maps)
}
/>
</div>
</div>
</div>
{/* )} */}
)}
</div>
</div>
{searchResultsObj["@odata.count"] > 5 && (
components/search/searchresults.js
+2 -2
View File
@@ -247,9 +247,9 @@ const SearchResults = (props) => {
resultsArr.map((item, key) => {
let detailsObj = jsonpath.query(
searchDetailsObj,
"$..value[?(@.pinswg_name=='" +
'$..value[?(@.pinswg_name=="' +
item.title +
"')]"
'")]'
);
detailsObj = detailsObj[0];
return (