Merge branch 'Development' into SIPS-Development
This commit is contained in:
+14
-12
@@ -145,7 +145,7 @@ const CaseSummary = (props) => {
|
||||
whichIncident +
|
||||
"')]",
|
||||
json: watchedCases,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
});
|
||||
|
||||
return isWatched;
|
||||
@@ -185,30 +185,30 @@ const CaseSummary = (props) => {
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.title=="' + caseReference + '")]',
|
||||
json: searchResultsObj,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
}))
|
||||
: currentType == "watchedCases"
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_title=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
}))
|
||||
: currentType == "myCases"
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_title=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
}))
|
||||
: currentType == "directResultsObj"
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.ticketnumber=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
}))
|
||||
: (casesObj = jsonpath({
|
||||
path: '$..[?(@.reference=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
}));
|
||||
|
||||
casesObj = Object.assign({}, ...casesObj);
|
||||
@@ -219,14 +219,14 @@ const CaseSummary = (props) => {
|
||||
? (detailsObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
|
||||
json: searchDetailsObj,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
}))
|
||||
: currentType == "directResultsObj"
|
||||
? (detailsObj = setCaseDetailsObj[0].value[0])
|
||||
: (detailsObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
|
||||
jsopn: setCaseDetailsObj,
|
||||
sandbox: {},
|
||||
eval: true,
|
||||
}));
|
||||
|
||||
detailsObj = typeof detailsObj == "object" ? detailsObj : detailsObj[0];
|
||||
@@ -667,14 +667,16 @@ const CaseSummary = (props) => {
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{router.locale == "cy"
|
||||
? jsonpath(
|
||||
'$..[?(@.value=="' +
|
||||
? jsonpath({
|
||||
path:
|
||||
'$..[?(@.value=="' +
|
||||
detailsObj[
|
||||
"pinswg_casestage@OData.Community.Display.V1.FormattedValue"
|
||||
] +
|
||||
'")].value_cy',
|
||||
transLookup
|
||||
)
|
||||
json: transLookup,
|
||||
eval: true,
|
||||
})
|
||||
: detailsObj[
|
||||
"pinswg_casestage@OData.Community.Display.V1.FormattedValue"
|
||||
] ||
|
||||
|
||||
Reference in New Issue
Block a user