From 986d5a382f285f8b76f100eee86e2245b559ac6f Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 4 Aug 2025 06:27:29 +0100 Subject: [PATCH] case ref not case title --- components/case.js | 1 + components/case/representation/index.js | 8 ++++++-- components/case/representation/representationAgent.js | 2 +- components/case/representation/representationAppellant.js | 2 +- components/case/representation/representationComplete.js | 2 +- .../representation/representationInterestedPartyPerson.js | 2 +- components/case/representation/representationLPA.js | 2 +- components/case/representation/representationLandowner.js | 2 +- .../representationLPAQuestionnaire_enforcement.js | 2 +- .../representationLPAQuestionnaire_s78.js | 2 +- components/case/summary.js | 5 +++-- components/myportal/topthree.js | 8 +++++--- components/myportal/topthree_reps.js | 2 +- components/myportal/viewall.js | 3 +++ components/representation.js | 1 + pages/api/file/generatepdf.js | 2 +- pages/myportal/case/[ticketnumber].js | 7 +++++-- pages/myportal/representation.js | 3 +++ 18 files changed, 37 insertions(+), 19 deletions(-) diff --git a/components/case.js b/components/case.js index 19631bbe..6d98d253 100644 --- a/components/case.js +++ b/components/case.js @@ -27,6 +27,7 @@ const Case = (props) => { watchedCasesDetails={props.watchedCasesDetails} awaitingSubmission={props.awaitingSubmission} caseReference={props.caseReference} + ticketnumber={props.ticketnumber} currentType={props.currentType} appealTypeID={props.appealTypeID} searchResultsObj={props.searchResultsObj} diff --git a/components/case/representation/index.js b/components/case/representation/index.js index bec951e1..894a7586 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -790,6 +790,7 @@ let MakeRepresentation = (props) => { "caseRef": props.props.currentView.caseReference.currentReference, "casereference": props.props.currentView.caseReference.currentReference, + "ticketnumber": props.props.currentView.caseReference.ticketnumber, "pinswg_questionnaireduedate": detailsObj.pinswg_questionnaireduedate, "pinswg_statementduedate": @@ -858,6 +859,7 @@ let MakeRepresentation = (props) => { props.props.currentView.caseReference.repDetails.appealType, "casereference": props.props.currentView.caseReference.currentReference, + "ticketnumber": props.props.currentView.caseReference.ticketnumber, "incidentID": props.props.currentView.caseReference.incidentid || props.props.currentView.caseReference.repDetails.incidentid, @@ -974,6 +976,8 @@ let MakeRepresentation = (props) => { props.props.currentView.caseReference.currentReference, "casereference": props.props.currentView.caseReference.currentReference, + "ticketnumber": + props.props.currentView.caseReference.ticketnumber, "pinswg_questionnaireduedate": detailsObj.pinswg_questionnaireduedate, "pinswg_endofrepresentationperiod": @@ -1090,7 +1094,7 @@ let MakeRepresentation = (props) => { generateRepPDF( values, props.props.accountDetails.containerID, - currentView.caseReference.currentReference + currentView.caseReference.ticketnumber ).then((data) => { console.log(data); data.status == "success" && @@ -1169,7 +1173,7 @@ let MakeRepresentation = (props) => { dataObj, [{}], values.containerID, - props.caseReference + "/" + dataObj.repfile_name + props.ticketnumber + "/" + dataObj.repfile_name ).then((data) => { return data; }); diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js index 6e13b87e..b84619a4 100644 --- a/components/case/representation/representationAgent.js +++ b/components/case/representation/representationAgent.js @@ -196,7 +196,7 @@ const RepAgent = (props) => { "myrepresentations:add-files-label" )} ticketnumber={ - props.props.caseReference + props.props.ticketnumber } hint={"sdsd"} fileList={ diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js index 5dc66794..a951c831 100644 --- a/components/case/representation/representationAppellant.js +++ b/components/case/representation/representationAppellant.js @@ -188,7 +188,7 @@ const RepAppellant = (props) => { label={t( "myrepresentations:add-files-label" )} - ticketnumber={props.props.caseReference} + ticketnumber={props.props.ticketnumber} hint={"sdsd"} fileList={ props.currentView.fileList diff --git a/components/case/representation/representationComplete.js b/components/case/representation/representationComplete.js index 0bfa4b12..4e8791c2 100644 --- a/components/case/representation/representationComplete.js +++ b/components/case/representation/representationComplete.js @@ -65,7 +65,7 @@ const RepComplete = (props) => { ), sendRepCompleteMessage( props.props.props.props.accountDetails.containerID, - props.props.currentView.caseReference.currentReference, + props.props.currentView.caseReference.ticketnumber, props.repFormData.repfile_name ), sendEmail(templateId, emailAddress, personalisation, reference), diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js index 11c3cca6..cf770d99 100644 --- a/components/case/representation/representationInterestedPartyPerson.js +++ b/components/case/representation/representationInterestedPartyPerson.js @@ -188,7 +188,7 @@ const RepInterestedPartyPerson = (props) => { "myrepresentations:add-files-label" )} ticketnumber={ - props.props.caseReference + props.props.ticketnumber } hint={"sdsd"} fileList={ diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js index 9818fe09..c540b0ce 100644 --- a/components/case/representation/representationLPA.js +++ b/components/case/representation/representationLPA.js @@ -353,7 +353,7 @@ let RepLPA = (props) => { "myrepresentations:add-files-label" )} ticketnumber={ - props.props.caseReference + props.props.ticketnumber } hint={"sdsd"} fileList={ diff --git a/components/case/representation/representationLandowner.js b/components/case/representation/representationLandowner.js index 8029b788..b6fe247b 100644 --- a/components/case/representation/representationLandowner.js +++ b/components/case/representation/representationLandowner.js @@ -84,7 +84,7 @@ const RepLandOwner = (props) => { label={t( "myrepresentations:add-files-label" )} - ticketnumber={props.props.caseReference} + ticketnumber={props.props.ticketnumber} hint={"sdsd"} fileList={[]} setFilesForRepresentation={[]} diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js index d8fdfbe0..c9c9e594 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js @@ -1213,7 +1213,7 @@ let Enforcement_Questionnaire = (props) => { name={"representationDocuments"} id={"representationDocuments"} label={t("myrepresentations:add-files-label")} - ticketnumber={props.props.props.caseReference} + ticketnumber={props.props.props.ticketnumber} hint={"sdsd"} fileList={ props.currentView.fileList diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js index ae86e2b8..e5c089bd 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js @@ -1022,7 +1022,7 @@ let S78_Questionnaire = (props) => { name={"representationDocuments"} id={"representationDocuments"} label={t("myrepresentations:add-files-label")} - ticketnumber={props.props.props.caseReference} + ticketnumber={props.props.props.ticketnumber} hint={"sdsd"} fileList={ props.currentView.fileList diff --git a/components/case/summary.js b/components/case/summary.js index c39190c1..66c85cc2 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -85,6 +85,7 @@ const CaseSummary = (props) => { currentView, messagesObj, docsOffline, + ticketnumber, } = props; const showLoginCheck = @@ -194,7 +195,7 @@ const CaseSummary = (props) => { })) : currentType == "directResultsObj" ? (casesObj = jsonpath({ - path: '$..[?(@ && @.ticketnumber=="' + caseReference + '")]', + path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]', json: setCaseQueryObj, eval: true, })) @@ -472,7 +473,7 @@ const CaseSummary = (props) => { ? casesObj.pinswg_title : currentType == "directResultsObj" - ? detailsObj.pinswg_name + ? casesObj.ticketnumber : casesObj.reference, }, }} diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js index 9d61d7fc..88443468 100644 --- a/components/myportal/topthree.js +++ b/components/myportal/topthree.js @@ -207,11 +207,11 @@ const TopThree = (props) => { showTopThreeArr[key].incidentid : router.locale == "cy" ? "/fymhorth/achos/" + - showTopThreeArr[key].pinswg_title + + showTopThreeArr[key].ticketnumber + "?key=" + topThreeType : "/myportal/case/" + - showTopThreeArr[key].pinswg_title + + showTopThreeArr[key].ticketnumber + "?key=" + topThreeType } @@ -257,7 +257,9 @@ const TopThree = (props) => { > {topThreeType != "watchedCases" ? topThreeType != "myRepresentations" - ? showTopThreeArr[key].ticketnumber + ? topThreeType == "mySubmittedReps" + ? showTopThreeArr[key].pinswg_title + : showTopThreeArr[key].ticketnumber : showTopThreeArr[key][ "_pinswg_case_value@OData.Community.Display.V1.FormattedValue" ] diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js index 1b9ab569..39ee1c83 100644 --- a/components/myportal/topthree_reps.js +++ b/components/myportal/topthree_reps.js @@ -201,7 +201,7 @@ const TopThree = (props) => { ? "/fymhorth/representation" : "/myportal/representation", query: { - case: showTopThreeArr[key].caseRef, + case: showTopThreeArr[key].ticketnumber, state: "edit", created: showTopThreeArr[key].repfile_name, diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js index 8301e9e1..06686339 100644 --- a/components/myportal/viewall.js +++ b/components/myportal/viewall.js @@ -268,6 +268,9 @@ const ViewAllResults = (props) => { ? currentView.viewKey == "myRepresentations" ? resultsArr[key].caseRef + : currentView.viewKey == + "mySubmittedReps" + ? resultsArr[key].pinswg_title : resultsArr[key].ticketnumber : resultsArr[key][ "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" diff --git a/components/representation.js b/components/representation.js index 418f80ac..77ebb8c7 100644 --- a/components/representation.js +++ b/components/representation.js @@ -22,6 +22,7 @@ const CaseRepresentation = (props) => { watchedCases={props.watchedCases} awaitingSubmission={props.awaitingSubmission} caseReference={props.caseReference} + ticketnumber={props.ticketnumber} currentType={props.currentType} searchResultsObj={props.searchResultsObj} searchDetailsObj={props.searchDetailsObj} diff --git a/pages/api/file/generatepdf.js b/pages/api/file/generatepdf.js index 10ae541c..910ee7d5 100644 --- a/pages/api/file/generatepdf.js +++ b/pages/api/file/generatepdf.js @@ -166,7 +166,7 @@ export default async function handler(req, res) { var containerID = reqBodyobj.containerID; var casefolderID = reqBodyobj.casefolderID; - var caseRef = reqBodyobj.caseRef; + var caseRef = reqBodyobj.ticketnumber; var representationType = reqBodyobj.representationType; var repRaiser = reqBodyobj.lastname; var localeSelect = reqBodyobj.locale; diff --git a/pages/myportal/case/[ticketnumber].js b/pages/myportal/case/[ticketnumber].js index 61e187db..6c41aba5 100644 --- a/pages/myportal/case/[ticketnumber].js +++ b/pages/myportal/case/[ticketnumber].js @@ -104,6 +104,9 @@ const CaseHome = (props) => { caseReference={ props.currentView.caseReference.currentReference } + ticketnumber={ + props.currentView.caseReference.ticketnumber + } currentType={props.currentType} appealTypeID={ props.currentView.caseReference.appealType @@ -384,12 +387,12 @@ const getDetails = (resultsObj, detailsType) => { caseID = data.pinswg_title; break; case "myWatchedCases": - case "mySubmittedReps": caseID = data[ "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" ]; break; + case "mySubmittedReps": case "awaitingSubmission": case "myRepresentations": caseID = data.ticketnumber; @@ -415,12 +418,12 @@ const getDetails = (resultsObj, detailsType) => { caseID = searchDetail.pinswg_title; break; case "myWatchedCases": - case "mySubmittedReps": caseID = searchDetail[ "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" ]; break; + case "mySubmittedReps": case "awaitingSubmission": caseID = searchDetail.ticketnumber; break; diff --git a/pages/myportal/representation.js b/pages/myportal/representation.js index ccfd4c63..8878254d 100644 --- a/pages/myportal/representation.js +++ b/pages/myportal/representation.js @@ -190,6 +190,9 @@ const RepresentationF = (props) => { caseReference={ props.currentView.caseReference.currentReference } + ticketnumber={ + props.currentView.caseReference.ticketnumber + } currentType={ props.currentView.caseReference.currentType }