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

Merge branch 'Development' into SIPS-Development

Browse Source
This commit is contained in:
robbond
2025-08-20 12:11:55 +01:00
parent 8f1aede2e3 6f58e7ad63
commit 92ceacb57b
71 changed files with 1683 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/myportal/case/[ticketnumber].js
+14 -13
View File
@@ -70,7 +70,9 @@ const CaseHome = (props) => {
<Head>
<title>
Reference:{" "}
{props.currentView.caseReference.currentReference}{" "}
{props.currentView.caseReference.currentReference ||
props.searchResultsObj.searchResultsObj.value[0]
.title}{" "}
</title>
</Head>
<div id="page_wrapper">
@@ -107,6 +109,10 @@ const CaseHome = (props) => {
props.searchResultsObj.searchResultsObj.value[0]
.ticketnumber
}
ticketnumber={
props.currentView.caseReference.ticketnumber ||
router.query.ticketnumber
}
currentType={props.currentType}
appealTypeID={
props.searchResultsObj.searchResultsObj.value[0]
@@ -129,9 +135,7 @@ const CaseHome = (props) => {
<Footer
footerLinks={footerLinks}
props={props}
ticketnumber={
props.currentView.caseReference.currentReference
}
ticketnumber={props.currentView.caseReference.ticketnumber}
/>
<TimeOut />
</div>
@@ -182,10 +186,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setAccountDetails(accountDetails));
store.dispatch(setLoggedInUserId(loggedInUser));
let developmentQuery =
query.ticketnumber.indexOf("CAS-") == 0
? query.ticketnumber
: query.ticketnumber.split("-").join(" ");
let developmentQuery = query.ticketnumber;
const pattern = /CAS-\d{5}-[A-Z0-9]{6}/;
const match = query.ticketnumber.match(pattern);
@@ -220,10 +221,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setSearch(developmentQuery));
console.log(
searchResultsObj["@odata.count"] > 1 ||
searchResultsObj["@odata.count"] < 1
);
// console.log(
// searchResultsObj["@odata.count"] > 1 ||
// searchResultsObj["@odata.count"] < 1
// );
if (searchResultsObj["@odata.count"] < 1) {
return {
@@ -432,7 +433,6 @@ const getDetails = (resultsObj, detailsType) => {
case "myCases":
caseID = data.pinswg_title;
break;
case "myWatchedCases":
case "mySubmittedReps":
caseID =
data[
@@ -440,6 +440,7 @@ const getDetails = (resultsObj, detailsType) => {
];
break;
case "awaitingSubmission":
case "myWatchedCases":
case "myRepresentations":
caseID = data.ticketnumber;
break;