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

Merge branch 'Development' into SIPS-Sprint-5-dev-merge-csp

Browse Source
This commit is contained in:
robbond
2025-04-16 15:46:10 +01:00
parent 2dc8a721ab dabc5a0697
commit 81fe090ce0
60 changed files with 493 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/myportal/advancedsearch.js
+2 -2
View File
@@ -148,7 +148,7 @@ let AdvancedSearch = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
optionsObj[key]
.name +
'")].value_cy',
@@ -253,7 +253,7 @@ let AdvancedSearch = (props) => {
: router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
optionsObj[key]
.value +
'")].value_cy',
components/myportal/awaitingsubmissionfromblob.js
+2 -2
View File
@@ -204,7 +204,7 @@ const AwaitingSubmissionFromBlob = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
getFormCollectionByID(
showTopThreeArr[key]
.pinswg_appealcasetype
@@ -297,7 +297,7 @@ const AwaitingSubmissionFromBlob = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
showTopThreeArr[key][
"pinswg_lpaname"
] +
components/myportal/topthree.js
+2 -2
View File
@@ -328,7 +328,7 @@ const TopThree = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
showTopThreeArr[key][
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
@@ -400,7 +400,7 @@ const TopThree = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
showTopThreeArr[key][
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
components/myportal/topthree_reps.js
+5 -5
View File
@@ -271,7 +271,7 @@ const TopThree = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
showTopThreeArr[key].representationType +
'")].value_cy',
json: transLookup,
@@ -285,7 +285,7 @@ const TopThree = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
showTopThreeArr[key]
.representationCapacity +
'" ||@.value_cy=="' +
@@ -297,7 +297,7 @@ const TopThree = (props) => {
})
: jsonpath({
path:
'$..[?(@.value_cy=="' +
'$..[?(@ && @.value_cy=="' +
showTopThreeArr[key]
.representationCapacity +
'")].value',
@@ -306,7 +306,7 @@ const TopThree = (props) => {
}).length > 0
? jsonpath({
path:
'$..[?(@.value_cy=="' +
'$..[?(@ && @.value_cy=="' +
showTopThreeArr[key]
.representationCapacity +
'")].value',
@@ -327,7 +327,7 @@ const TopThree = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
showTopThreeArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
components/myportal/uploadFile.js
+1 -1
View File
@@ -290,7 +290,7 @@ let UploadFile = (props) => {
const uploadAction = await uploadFiles(dataObj, fileObj).then(
(data) => {
console.log("hello", data);
console.log("$1", data);
}
);
// router.push({
components/myportal/viewall.js
+14 -14
View File
@@ -118,7 +118,7 @@ const ViewAllResults = (props) => {
(currentView.viewKey == "myRepresentations"
? ""
: "..value") +
'[?(@.pinswg_name=="' +
'[?(@ && @.pinswg_name=="' +
(currentView.viewKey == "awaitingSubmissionDetails"
? item.title
: currentView.viewKey == "watchedCases"
@@ -480,7 +480,7 @@ const ViewAllResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
resultsArr[key].pinswg_lpaname +
'")].value_cy',
json: transLookup,
@@ -494,7 +494,7 @@ const ViewAllResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
resultsArr[key][
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
@@ -512,7 +512,7 @@ const ViewAllResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
searchDetailsObj[key].value[0][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee"
] +
@@ -532,7 +532,7 @@ const ViewAllResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
resultsArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee"
] +
@@ -550,7 +550,7 @@ const ViewAllResults = (props) => {
router.locale == "cy" &&
jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
searchDetailsObj[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
@@ -568,7 +568,7 @@ const ViewAllResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
getFormCollectionByID(
item.pinswg_appealcasetype
).value +
@@ -582,7 +582,7 @@ const ViewAllResults = (props) => {
: router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
@@ -601,7 +601,7 @@ const ViewAllResults = (props) => {
(router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
getFormCollectionByID(
searchDetailsObj[key].appealType
).value +
@@ -629,7 +629,7 @@ const ViewAllResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.statuscode=="' +
'$..[?(@ && @.statuscode=="' +
item.statuscode +
'")].value_cy',
json: transLookup,
@@ -637,7 +637,7 @@ const ViewAllResults = (props) => {
})
: jsonpath({
path:
'$..[?(@.statuscode=="' +
'$..[?(@ && @.statuscode=="' +
item.statuscode +
'")].value',
json: transLookup,
@@ -647,7 +647,7 @@ const ViewAllResults = (props) => {
? repRaisedDate(item.repfile_name) // ? router.locale == "cy"
: // ? jsonpath({path:
//
// '$..[?(@.value=="' +
// '$..[?(@ && @.value=="' +
// searchDetailsObj[key].value[0][
// "statuscode@OData.Community.Display.V1.FormattedValue"
// ] +
@@ -659,7 +659,7 @@ const ViewAllResults = (props) => {
// : router.locale == "cy"
// ? jsonpath({path:
//
// '$..[?(@.value=="' +
// '$..[?(@ && @.value=="' +
// item[
// "statuscode@OData.Community.Display.V1.FormattedValue"
// ] +
@@ -669,7 +669,7 @@ const ViewAllResults = (props) => {
router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +