diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index a1a56247..10b460cd 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -158,74 +158,83 @@ const TopThree = (props) => {
{t("myportal:case-reference")}:
-
+ {showTopThreeArr[key].ticketnumber}{" "}
+ - Pending
+
+ ) : (
+ {
- setCurrentReference({
- "ticketnumber":
- showTopThreeArr[key].ticketnumber,
- "currentReference":
- topThreeType != "watchedCases"
- ? topThreeType !=
- "myRepresentations"
- ? showTopThreeArr[key]
- .ticketnumber
+ .pinswg_appealcasetype +
+ "&casereference=" +
+ showTopThreeArr[key]
+ .pinswg_title +
+ "&inid=" +
+ showTopThreeArr[key].incidentid
+ : router.locale == "cy"
+ ? "/fymhorth/achos"
+ : "/myportal/case"
+ }
+ className="govuk-link--no-underline"
+ data-id={index}
+ onClick={() => {
+ setCurrentReference({
+ "ticketnumber":
+ showTopThreeArr[key].ticketnumber,
+ "currentReference":
+ topThreeType != "watchedCases"
+ ? topThreeType !=
+ "myRepresentations"
+ ? showTopThreeArr[key]
+ .ticketnumber
+ : showTopThreeArr[key][
+ "_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
+ ]
: showTopThreeArr[key][
- "_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
- ]
- : showTopThreeArr[key][
- "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
- ],
- "currentType": topThreeType,
+ "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+ ],
+ "currentType": topThreeType,
- "incidentid": getIncidentId(
- topThreeType,
- showTopThreeArr[key]
- ),
+ "incidentid": getIncidentId(
+ topThreeType,
+ showTopThreeArr[key]
+ ),
- "appealType":
- showTopThreeArr[key]
- .pinswg_appealcasetype,
- });
- }}
- >
- {topThreeType != "watchedCases"
- ? topThreeType != "myRepresentations"
- ? showTopThreeArr[key].ticketnumber
+ "appealType":
+ showTopThreeArr[key]
+ .pinswg_appealcasetype,
+ });
+ }}
+ >
+ {topThreeType != "watchedCases"
+ ? topThreeType != "myRepresentations"
+ ? showTopThreeArr[key].ticketnumber
+ : showTopThreeArr[key][
+ "_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
+ ]
: showTopThreeArr[key][
- "_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
- ]
- : showTopThreeArr[key][
- "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
- ]}{" "}
-
+ "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+ ]}{" "}
+
+ )}
{/* {(topThreeType == "awaitingSubmission" ||
topThreeType == "watchedCases") && ( */}
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index be66c4d9..29e2f0fe 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -78,88 +78,102 @@ const ViewAllResults = (props) => {
resultsRowArr.push(
-
+ {resultsArr[key].ticketnumber} Pending
+
+ ) : (
+
{
- setCurrentReference({
- "ticketnumber":
- resultsArr[key].ticketnumber,
- "currentReference":
- currentView.viewKey != "watchedCases"
- ? currentView.viewKey ==
- "myRepresentations"
- ? resultsArr[key].caseRef
- : resultsArr[key].ticketnumber
- : resultsArr[key][
- "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
- ],
+ .pinswg_appealcasetype +
+ "&casereference=" +
+ resultsArr[key].title +
+ "&inid=" +
+ resultsArr[key].incidentid
+ : router.locale == "cy"
+ ? myportal == true
+ ? "/fymhorth/achos"
+ : "/achos"
+ : myportal == true
+ ? "/myportal/case"
+ : "/case"
+ }
+ onClick={() => {
+ setCurrentReference({
+ "ticketnumber":
+ resultsArr[key].ticketnumber,
+ "currentReference":
+ currentView.viewKey !=
+ "watchedCases"
+ ? currentView.viewKey ==
+ "myRepresentations"
+ ? resultsArr[key].caseRef
+ : resultsArr[key]
+ .ticketnumber
+ : resultsArr[key][
+ "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+ ],
- "currentType": currentView.viewKey,
- "incidentid":
- currentView.viewKey != "watchedCases"
- ? resultsArr[key].incidentid
- : resultsArr[key][
- "_pinswg_watchedcase_value"
- ],
+ "currentType": currentView.viewKey,
+ "incidentid":
+ currentView.viewKey !=
+ "watchedCases"
+ ? resultsArr[key].incidentid
+ : resultsArr[key][
+ "_pinswg_watchedcase_value"
+ ],
- "appealType":
- resultsArr[key].pinswg_appealcasetype,
- "repDetails":
- currentView.viewKey ==
- "myRepresentations" &&
- resultsArr[key],
- });
- }}
- >
-
- {t("search:searchresults-case-reference-label")}
- :
-
- {currentView.viewKey != "watchedCases"
- ? currentView.viewKey == "myRepresentations"
- ? resultsArr[key].caseRef
- : resultsArr[key].ticketnumber
- : resultsArr[key][
- "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
- ]}
-
+ "appealType":
+ resultsArr[key]
+ .pinswg_appealcasetype,
+ "repDetails":
+ currentView.viewKey ==
+ "myRepresentations" &&
+ resultsArr[key],
+ });
+ }}
+ >
+
+ {t(
+ "search:searchresults-case-reference-label"
+ )}
+ :
+
+ {currentView.viewKey != "watchedCases"
+ ? currentView.viewKey == "myRepresentations"
+ ? resultsArr[key].caseRef
+ : resultsArr[key].ticketnumber
+ : resultsArr[key][
+ "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+ ]}
+
+ )}
diff --git a/pages/api/endpoint/getmycases_api.js b/pages/api/endpoint/getmycases_api.js
index 1024bf5d..eeaaa490 100644
--- a/pages/api/endpoint/getmycases_api.js
+++ b/pages/api/endpoint/getmycases_api.js
@@ -41,7 +41,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
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 +
" and servicestage eq 0 and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";