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

Merge branch 'Development' into SIPS-Development

Browse Source
This commit is contained in:
robbond
2025-07-03 11:20:38 +01:00
parent a5dbd52d73 d59290364d
commit 39dc5a349a
16 changed files with 93 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/myportal/viewall.js
+6 -2
View File
@@ -248,8 +248,12 @@ const ViewAllResults = (props) => {
viewAllKey
: router.locale == "cy"
? myportal == true
? "/fymhorth/achos"
: "/achos"
? "/fymhorth/achos" +
resultsArr[key].ticketnumber +
"?key=" +
currentView.viewKey
: "/achos" +
resultsArr[key].ticketnumber
: myportal == true
? "/myportal/case/" +
resultsArr[key].ticketnumber +
components/search/searchresults.js
+5 -5
View File
@@ -350,15 +350,15 @@ const SearchResults = (props) => {
<div></div>
<Link
href={
router.locale == "cy"
(router.locale == "cy"
? myportal == true
? "/fymhorth/achos"
: "/achos"
: myportal == true
? "/myportal/case/" +
item.ticketnumber
: "/case/" +
item.ticketnumber
? "/myportal/case"
: "/case") +
"/" +
item.ticketnumber
}
className="govuk-link--no-underline"
onClick={() => {
components/utils/index.js
+24 -21
View File
@@ -115,17 +115,19 @@ export const getSearchDetails = async (searchResultsObj) => {
}
);
} else {
detailsArr.push(
getBasicSearchDetails(
formMeta.LogicalCollectionName,
searchDetail.title,
formMeta.PrimaryIdAttribute,
searchDetail.incidentid
) || {
"@odata.count": 1,
"value": [{ "title": searchDetail.title }],
}
);
formMeta?.LogicalCollectionName &&
formMeta?.LogicalCollectionName != "pinswg_sipses" &&
detailsArr.push(
getBasicSearchDetails(
formMeta.LogicalCollectionName,
searchDetail.title,
formMeta.PrimaryIdAttribute,
searchDetail.incidentid
) || {
"@odata.count": 1,
"value": [{ "title": searchDetail.title }],
}
);
}
});
// Promise.all(detailsArr).then((data) => {
@@ -150,7 +152,7 @@ export const getPartSavedDetails = (searchResultsObj) => {
let formMeta = getFormCollectionByID(
searchDetail.pinswg_appealcasetype
);
console.log(formMeta);
// console.log(formMeta);
detailsArr.push(
getBasicPartSavedDetails(
formMeta.LogicalCollectionName,
@@ -178,15 +180,16 @@ export const getSearchDetailsPaged = (searchResultsObj) => {
let formMeta = getFormCollectionByID(
searchDetail.pinswg_appealcasetype
);
detailsArr.push(
getBasicSearchDetailsPaged(
formMeta.LogicalCollectionName,
searchDetail.title,
formMeta.PrimaryIdAttribute,
searchDetail.incidentid
)
);
formMeta?.LogicalCollectionName &&
formMeta?.LogicalCollectionName != "pinswg_sipses" &&
detailsArr.push(
getBasicSearchDetailsPaged(
formMeta.LogicalCollectionName,
searchDetail.title,
formMeta.PrimaryIdAttribute,
searchDetail.incidentid
)
);
}
});
return Promise.all(detailsArr);