only give link for published cases in my case card
This commit is contained in:
@@ -158,74 +158,83 @@ const TopThree = (props) => {
|
|||||||
<div className="cardModuleDetails">
|
<div className="cardModuleDetails">
|
||||||
<div className="cardModuleReference">
|
<div className="cardModuleReference">
|
||||||
<b>{t("myportal:case-reference")}:</b>
|
<b>{t("myportal:case-reference")}:</b>
|
||||||
<Link
|
{topThreeType == "myCases" &&
|
||||||
href={
|
showTopThreeArr[key].pinswg_publishtoweb === false ? (
|
||||||
topThreeType == "awaitingSubmission" ||
|
<span>
|
||||||
topThreeType == "awaitingSubmissionFromBlob"
|
{showTopThreeArr[key].ticketnumber}{" "}
|
||||||
? router.locale == "cy"
|
<b> - Pending</b>
|
||||||
? "/fymhorth/parhauigyflwyno"
|
</span>
|
||||||
: "/myportal" +
|
) : (
|
||||||
"/" +
|
<Link
|
||||||
getFormCollectionByID(
|
href={
|
||||||
|
topThreeType == "awaitingSubmission" ||
|
||||||
|
topThreeType == "awaitingSubmissionFromBlob"
|
||||||
|
? router.locale == "cy"
|
||||||
|
? "/fymhorth/parhauigyflwyno"
|
||||||
|
: "/myportal" +
|
||||||
|
"/" +
|
||||||
|
getFormCollectionByID(
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.pinswg_appealcasetype
|
||||||
|
).UrlName +
|
||||||
|
"?lpa=" +
|
||||||
|
showTopThreeArr[key][
|
||||||
|
"_pinswg_associatedlpa_value"
|
||||||
|
] +
|
||||||
|
"&apt=" +
|
||||||
showTopThreeArr[key]
|
showTopThreeArr[key]
|
||||||
.pinswg_appealcasetype
|
.pinswg_appealcasetype +
|
||||||
).UrlName +
|
"&casereference=" +
|
||||||
"?lpa=" +
|
showTopThreeArr[key]
|
||||||
showTopThreeArr[key][
|
.pinswg_title +
|
||||||
"_pinswg_associatedlpa_value"
|
"&inid=" +
|
||||||
] +
|
showTopThreeArr[key].incidentid
|
||||||
"&apt=" +
|
: router.locale == "cy"
|
||||||
showTopThreeArr[key]
|
? "/fymhorth/achos"
|
||||||
.pinswg_appealcasetype +
|
: "/myportal/case"
|
||||||
"&casereference=" +
|
}
|
||||||
showTopThreeArr[key].pinswg_title +
|
className="govuk-link--no-underline"
|
||||||
"&inid=" +
|
data-id={index}
|
||||||
showTopThreeArr[key].incidentid
|
onClick={() => {
|
||||||
: router.locale == "cy"
|
setCurrentReference({
|
||||||
? "/fymhorth/achos"
|
"ticketnumber":
|
||||||
: "/myportal/case"
|
showTopThreeArr[key].ticketnumber,
|
||||||
}
|
"currentReference":
|
||||||
className="govuk-link--no-underline"
|
topThreeType != "watchedCases"
|
||||||
data-id={index}
|
? topThreeType !=
|
||||||
onClick={() => {
|
"myRepresentations"
|
||||||
setCurrentReference({
|
? showTopThreeArr[key]
|
||||||
"ticketnumber":
|
.ticketnumber
|
||||||
showTopThreeArr[key].ticketnumber,
|
: showTopThreeArr[key][
|
||||||
"currentReference":
|
"_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
|
||||||
topThreeType != "watchedCases"
|
]
|
||||||
? topThreeType !=
|
|
||||||
"myRepresentations"
|
|
||||||
? showTopThreeArr[key]
|
|
||||||
.ticketnumber
|
|
||||||
: showTopThreeArr[key][
|
: showTopThreeArr[key][
|
||||||
"_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
],
|
||||||
: showTopThreeArr[key][
|
"currentType": topThreeType,
|
||||||
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
|
||||||
],
|
|
||||||
"currentType": topThreeType,
|
|
||||||
|
|
||||||
"incidentid": getIncidentId(
|
"incidentid": getIncidentId(
|
||||||
topThreeType,
|
topThreeType,
|
||||||
showTopThreeArr[key]
|
showTopThreeArr[key]
|
||||||
),
|
),
|
||||||
|
|
||||||
"appealType":
|
"appealType":
|
||||||
showTopThreeArr[key]
|
showTopThreeArr[key]
|
||||||
.pinswg_appealcasetype,
|
.pinswg_appealcasetype,
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{topThreeType != "watchedCases"
|
{topThreeType != "watchedCases"
|
||||||
? topThreeType != "myRepresentations"
|
? topThreeType != "myRepresentations"
|
||||||
? showTopThreeArr[key].ticketnumber
|
? showTopThreeArr[key].ticketnumber
|
||||||
|
: showTopThreeArr[key][
|
||||||
|
"_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
|
||||||
|
]
|
||||||
: showTopThreeArr[key][
|
: showTopThreeArr[key][
|
||||||
"_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]}{" "}
|
||||||
: showTopThreeArr[key][
|
</Link>
|
||||||
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
)}
|
||||||
]}{" "}
|
|
||||||
</Link>
|
|
||||||
</div>
|
</div>
|
||||||
{/* {(topThreeType == "awaitingSubmission" ||
|
{/* {(topThreeType == "awaitingSubmission" ||
|
||||||
topThreeType == "watchedCases") && ( */}
|
topThreeType == "watchedCases") && ( */}
|
||||||
|
|||||||
@@ -78,88 +78,102 @@ const ViewAllResults = (props) => {
|
|||||||
resultsRowArr.push(
|
resultsRowArr.push(
|
||||||
<div className="govuk-summary-list__row" key={key}>
|
<div className="govuk-summary-list__row" key={key}>
|
||||||
<dd className="govuk-summary-list__value govuk-!-font-size-16 govuk-!-padding-left-2">
|
<dd className="govuk-summary-list__value govuk-!-font-size-16 govuk-!-padding-left-2">
|
||||||
<Link
|
{currentView.viewKey == "myCases" &&
|
||||||
href={
|
resultsArr[key].pinswg_publishtoweb === false ? (
|
||||||
currentView.viewKey == "myRepresentations"
|
<div className="cardModuleReference">
|
||||||
? {
|
{resultsArr[key].ticketnumber} <b> Pending</b>
|
||||||
pathname: "/myportal/representation",
|
</div>
|
||||||
query: {
|
) : (
|
||||||
case: resultsArr[key].caseRef,
|
<Link
|
||||||
state: "edit",
|
href={
|
||||||
},
|
currentView.viewKey == "myRepresentations"
|
||||||
}
|
? {
|
||||||
: currentView.viewKey ==
|
pathname:
|
||||||
"awaitingSubmissionDetails"
|
"/myportal/representation",
|
||||||
? router.locale == "cy"
|
query: {
|
||||||
? "/fymhorth/parhauigyflwyno"
|
case: resultsArr[key].caseRef,
|
||||||
: "/myportal" +
|
state: "edit",
|
||||||
"/" +
|
},
|
||||||
getFormCollectionByID(
|
}
|
||||||
|
: currentView.viewKey ==
|
||||||
|
"awaitingSubmissionDetails"
|
||||||
|
? router.locale == "cy"
|
||||||
|
? "/fymhorth/parhauigyflwyno"
|
||||||
|
: "/myportal" +
|
||||||
|
"/" +
|
||||||
|
getFormCollectionByID(
|
||||||
|
resultsArr[key]
|
||||||
|
.pinswg_appealcasetype
|
||||||
|
).UrlName +
|
||||||
|
"?lpa=" +
|
||||||
|
resultsArr[key][
|
||||||
|
"_pinswg_associatedlpa_value"
|
||||||
|
] +
|
||||||
|
"&apt=" +
|
||||||
resultsArr[key]
|
resultsArr[key]
|
||||||
.pinswg_appealcasetype
|
.pinswg_appealcasetype +
|
||||||
).UrlName +
|
"&casereference=" +
|
||||||
"?lpa=" +
|
resultsArr[key].title +
|
||||||
resultsArr[key][
|
"&inid=" +
|
||||||
"_pinswg_associatedlpa_value"
|
resultsArr[key].incidentid
|
||||||
] +
|
: router.locale == "cy"
|
||||||
"&apt=" +
|
? myportal == true
|
||||||
resultsArr[key]
|
? "/fymhorth/achos"
|
||||||
.pinswg_appealcasetype +
|
: "/achos"
|
||||||
"&casereference=" +
|
: myportal == true
|
||||||
resultsArr[key].title +
|
? "/myportal/case"
|
||||||
"&inid=" +
|
: "/case"
|
||||||
resultsArr[key].incidentid
|
}
|
||||||
: router.locale == "cy"
|
onClick={() => {
|
||||||
? myportal == true
|
setCurrentReference({
|
||||||
? "/fymhorth/achos"
|
"ticketnumber":
|
||||||
: "/achos"
|
resultsArr[key].ticketnumber,
|
||||||
: myportal == true
|
"currentReference":
|
||||||
? "/myportal/case"
|
currentView.viewKey !=
|
||||||
: "/case"
|
"watchedCases"
|
||||||
}
|
? currentView.viewKey ==
|
||||||
onClick={() => {
|
"myRepresentations"
|
||||||
setCurrentReference({
|
? resultsArr[key].caseRef
|
||||||
"ticketnumber":
|
: resultsArr[key]
|
||||||
resultsArr[key].ticketnumber,
|
.ticketnumber
|
||||||
"currentReference":
|
: resultsArr[key][
|
||||||
currentView.viewKey != "watchedCases"
|
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
||||||
? currentView.viewKey ==
|
],
|
||||||
"myRepresentations"
|
|
||||||
? resultsArr[key].caseRef
|
|
||||||
: resultsArr[key].ticketnumber
|
|
||||||
: resultsArr[key][
|
|
||||||
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
|
||||||
],
|
|
||||||
|
|
||||||
"currentType": currentView.viewKey,
|
"currentType": currentView.viewKey,
|
||||||
"incidentid":
|
"incidentid":
|
||||||
currentView.viewKey != "watchedCases"
|
currentView.viewKey !=
|
||||||
? resultsArr[key].incidentid
|
"watchedCases"
|
||||||
: resultsArr[key][
|
? resultsArr[key].incidentid
|
||||||
"_pinswg_watchedcase_value"
|
: resultsArr[key][
|
||||||
],
|
"_pinswg_watchedcase_value"
|
||||||
|
],
|
||||||
|
|
||||||
"appealType":
|
"appealType":
|
||||||
resultsArr[key].pinswg_appealcasetype,
|
resultsArr[key]
|
||||||
"repDetails":
|
.pinswg_appealcasetype,
|
||||||
currentView.viewKey ==
|
"repDetails":
|
||||||
"myRepresentations" &&
|
currentView.viewKey ==
|
||||||
resultsArr[key],
|
"myRepresentations" &&
|
||||||
});
|
resultsArr[key],
|
||||||
}}
|
});
|
||||||
>
|
}}
|
||||||
<span className="results-visually-hidden">
|
>
|
||||||
{t("search:searchresults-case-reference-label")}
|
<span className="results-visually-hidden">
|
||||||
:
|
{t(
|
||||||
</span>
|
"search:searchresults-case-reference-label"
|
||||||
{currentView.viewKey != "watchedCases"
|
)}
|
||||||
? currentView.viewKey == "myRepresentations"
|
:
|
||||||
? resultsArr[key].caseRef
|
</span>
|
||||||
: resultsArr[key].ticketnumber
|
{currentView.viewKey != "watchedCases"
|
||||||
: resultsArr[key][
|
? currentView.viewKey == "myRepresentations"
|
||||||
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
? resultsArr[key].caseRef
|
||||||
]}
|
: resultsArr[key].ticketnumber
|
||||||
</Link>
|
: resultsArr[key][
|
||||||
|
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
||||||
|
]}
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
</dd>
|
</dd>
|
||||||
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
||||||
<span className="results-visually-hidden">
|
<span className="results-visually-hidden">
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
var token = await getToken();
|
var token = await getToken();
|
||||||
|
|
||||||
var queryUrl =
|
var queryUrl =
|
||||||
"incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantlastname,pinswg_appellantfirstname,pinswg_appellantagent,pinswg_agentfirstname,pinswg_agentlastname,pinswg_agentcompanyname&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
|
"incidents?$select=modifiedon,pinswg_publishtoweb,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantlastname,pinswg_appellantfirstname,pinswg_appellantagent,pinswg_agentfirstname,pinswg_agentlastname,pinswg_agentcompanyname&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
|
||||||
loggedInUserId +
|
loggedInUserId +
|
||||||
" and servicestage eq 0 and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
|
" and servicestage eq 0 and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user