Merge branch 'Development' into SIPS-Development
This commit is contained in:
@@ -157,10 +157,11 @@ const DocumentDetails = (props) => {
|
||||
>
|
||||
<option value="all" key="00">
|
||||
{router.locale == "cy"
|
||||
? jsonpath(
|
||||
'$..[?(@.value=="All")].value_cy',
|
||||
transLookup
|
||||
)
|
||||
? jsonpath({
|
||||
path: '$..[?(@.value=="All")].value_cy',
|
||||
json: transLookup,
|
||||
sandbox: {},
|
||||
})
|
||||
: "All"}
|
||||
</option>
|
||||
{documentTypes.map((item, key) => {
|
||||
@@ -172,12 +173,14 @@ const DocumentDetails = (props) => {
|
||||
}
|
||||
>
|
||||
{router.locale == "cy"
|
||||
? jsonpath(
|
||||
'$..[?(@.value=="' +
|
||||
? jsonpath({
|
||||
path:
|
||||
'$..[?(@.value=="' +
|
||||
item.pinswg_isharedocumentlocationsLabel +
|
||||
'")].value_cy',
|
||||
transLookup
|
||||
)
|
||||
json: transLookup,
|
||||
sandbox: {},
|
||||
})
|
||||
: item.pinswg_isharedocumentlocationsLabel ||
|
||||
t(
|
||||
"case:summary-no-date-entered-label"
|
||||
@@ -320,12 +323,14 @@ const DocumentDetails = (props) => {
|
||||
</div>
|
||||
) : (
|
||||
documentDetailsArr.map((item, key) => {
|
||||
let detailsObj = jsonpath(
|
||||
"$..[?(@._pinswg_documentids_value=='" +
|
||||
let detailsObj = jsonpath({
|
||||
path:
|
||||
"$..[?(@._pinswg_documentids_value=='" +
|
||||
incidentid +
|
||||
"')]",
|
||||
item
|
||||
);
|
||||
json: item,
|
||||
sanbox: {},
|
||||
});
|
||||
detailsObj = item;
|
||||
return (
|
||||
<div
|
||||
@@ -406,14 +411,16 @@ const DocumentDetails = (props) => {
|
||||
</span>
|
||||
|
||||
{router.locale == "cy"
|
||||
? jsonpath(
|
||||
'$..[?(@.value=="' +
|
||||
? jsonpath({
|
||||
path:
|
||||
'$..[?(@.value=="' +
|
||||
detailsObj[
|
||||
"pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
|
||||
] +
|
||||
'")].value_cy',
|
||||
transLookup
|
||||
)
|
||||
json: transLookup,
|
||||
sanbox: {},
|
||||
})
|
||||
: detailsObj[
|
||||
"pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
|
||||
] ||
|
||||
@@ -572,12 +579,14 @@ const DocumentDetails = (props) => {
|
||||
}
|
||||
>
|
||||
{router.locale == "cy"
|
||||
? jsonpath(
|
||||
'$..[?(@.value=="' +
|
||||
? jsonpath({
|
||||
path:
|
||||
'$..[?(@.value=="' +
|
||||
item.pinswg_isharedocumentlocationsLabel +
|
||||
'")].value_cy',
|
||||
transLookup
|
||||
)
|
||||
jsonL: transLookup,
|
||||
sanbox: {},
|
||||
})
|
||||
: item.pinswg_isharedocumentlocationsLabel ||
|
||||
t(
|
||||
"case:summary-no-date-entered-label"
|
||||
@@ -731,12 +740,14 @@ const DocumentDetails = (props) => {
|
||||
</div>
|
||||
) : (
|
||||
documentDetailsArr.map((item, key) => {
|
||||
let detailsObj = jsonpath(
|
||||
"$..[?(@._pinswg_documentids_value=='" +
|
||||
let detailsObj = jsonpath({
|
||||
path:
|
||||
"$..[?(@._pinswg_documentids_value=='" +
|
||||
incidentid +
|
||||
"')]",
|
||||
item
|
||||
);
|
||||
json: item,
|
||||
sandbox: {},
|
||||
});
|
||||
detailsObj = item;
|
||||
return (
|
||||
<div
|
||||
@@ -822,14 +833,16 @@ const DocumentDetails = (props) => {
|
||||
</span>
|
||||
|
||||
{router.locale == "cy"
|
||||
? jsonpath(
|
||||
'$..[?(@.value=="' +
|
||||
? jsonpath({
|
||||
path:
|
||||
'$..[?(@.value=="' +
|
||||
detailsObj[
|
||||
"pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
|
||||
] +
|
||||
'")].value_cy',
|
||||
transLookup
|
||||
)
|
||||
json: transLookup,
|
||||
sandbox: {},
|
||||
})
|
||||
: detailsObj[
|
||||
"pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
|
||||
] ||
|
||||
|
||||
Reference in New Issue
Block a user