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

case ref not case title

Browse Source
This commit is contained in:
robbond
2025-08-04 06:27:29 +01:00
parent 9845af7046
commit 986d5a382f
18 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case.js
+1
View File
@@ -27,6 +27,7 @@ const Case = (props) => {
watchedCasesDetails={props.watchedCasesDetails} watchedCasesDetails={props.watchedCasesDetails}
awaitingSubmission={props.awaitingSubmission} awaitingSubmission={props.awaitingSubmission}
caseReference={props.caseReference} caseReference={props.caseReference}
ticketnumber={props.ticketnumber}
currentType={props.currentType} currentType={props.currentType}
appealTypeID={props.appealTypeID} appealTypeID={props.appealTypeID}
searchResultsObj={props.searchResultsObj} searchResultsObj={props.searchResultsObj}
components/case/representation/index.js
+6 -2
View File
@@ -790,6 +790,7 @@ let MakeRepresentation = (props) => {
"caseRef": props.props.currentView.caseReference.currentReference, "caseRef": props.props.currentView.caseReference.currentReference,
"casereference": "casereference":
props.props.currentView.caseReference.currentReference, props.props.currentView.caseReference.currentReference,
"ticketnumber": props.props.currentView.caseReference.ticketnumber,
"pinswg_questionnaireduedate": "pinswg_questionnaireduedate":
detailsObj.pinswg_questionnaireduedate, detailsObj.pinswg_questionnaireduedate,
"pinswg_statementduedate": "pinswg_statementduedate":
@@ -858,6 +859,7 @@ let MakeRepresentation = (props) => {
props.props.currentView.caseReference.repDetails.appealType, props.props.currentView.caseReference.repDetails.appealType,
"casereference": "casereference":
props.props.currentView.caseReference.currentReference, props.props.currentView.caseReference.currentReference,
"ticketnumber": props.props.currentView.caseReference.ticketnumber,
"incidentID": "incidentID":
props.props.currentView.caseReference.incidentid || props.props.currentView.caseReference.incidentid ||
props.props.currentView.caseReference.repDetails.incidentid, props.props.currentView.caseReference.repDetails.incidentid,
@@ -974,6 +976,8 @@ let MakeRepresentation = (props) => {
props.props.currentView.caseReference.currentReference, props.props.currentView.caseReference.currentReference,
"casereference": "casereference":
props.props.currentView.caseReference.currentReference, props.props.currentView.caseReference.currentReference,
"ticketnumber":
props.props.currentView.caseReference.ticketnumber,
"pinswg_questionnaireduedate": "pinswg_questionnaireduedate":
detailsObj.pinswg_questionnaireduedate, detailsObj.pinswg_questionnaireduedate,
"pinswg_endofrepresentationperiod": "pinswg_endofrepresentationperiod":
@@ -1090,7 +1094,7 @@ let MakeRepresentation = (props) => {
generateRepPDF( generateRepPDF(
values, values,
props.props.accountDetails.containerID, props.props.accountDetails.containerID,
currentView.caseReference.currentReference currentView.caseReference.ticketnumber
).then((data) => { ).then((data) => {
console.log(data); console.log(data);
data.status == "success" && data.status == "success" &&
@@ -1169,7 +1173,7 @@ let MakeRepresentation = (props) => {
dataObj, dataObj,
[{}], [{}],
values.containerID, values.containerID,
props.caseReference + "/" + dataObj.repfile_name props.ticketnumber + "/" + dataObj.repfile_name
).then((data) => { ).then((data) => {
return data; return data;
}); });
components/case/representation/representationAgent.js
+1 -1
View File
@@ -196,7 +196,7 @@ const RepAgent = (props) => {
"myrepresentations:add-files-label" "myrepresentations:add-files-label"
)} )}
ticketnumber={ ticketnumber={
props.props.caseReference props.props.ticketnumber
} }
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
components/case/representation/representationAppellant.js
+1 -1
View File
@@ -188,7 +188,7 @@ const RepAppellant = (props) => {
label={t( label={t(
"myrepresentations:add-files-label" "myrepresentations:add-files-label"
)} )}
ticketnumber={props.props.caseReference} ticketnumber={props.props.ticketnumber}
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.currentView.fileList props.currentView.fileList
components/case/representation/representationComplete.js
+1 -1
View File
@@ -65,7 +65,7 @@ const RepComplete = (props) => {
), ),
sendRepCompleteMessage( sendRepCompleteMessage(
props.props.props.props.accountDetails.containerID, props.props.props.props.accountDetails.containerID,
props.props.currentView.caseReference.currentReference, props.props.currentView.caseReference.ticketnumber,
props.repFormData.repfile_name props.repFormData.repfile_name
), ),
sendEmail(templateId, emailAddress, personalisation, reference), sendEmail(templateId, emailAddress, personalisation, reference),
components/case/representation/representationInterestedPartyPerson.js
+1 -1
View File
@@ -188,7 +188,7 @@ const RepInterestedPartyPerson = (props) => {
"myrepresentations:add-files-label" "myrepresentations:add-files-label"
)} )}
ticketnumber={ ticketnumber={
props.props.caseReference props.props.ticketnumber
} }
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
components/case/representation/representationLPA.js
+1 -1
View File
@@ -353,7 +353,7 @@ let RepLPA = (props) => {
"myrepresentations:add-files-label" "myrepresentations:add-files-label"
)} )}
ticketnumber={ ticketnumber={
props.props.caseReference props.props.ticketnumber
} }
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
components/case/representation/representationLandowner.js
+1 -1
View File
@@ -84,7 +84,7 @@ const RepLandOwner = (props) => {
label={t( label={t(
"myrepresentations:add-files-label" "myrepresentations:add-files-label"
)} )}
ticketnumber={props.props.caseReference} ticketnumber={props.props.ticketnumber}
hint={"sdsd"} hint={"sdsd"}
fileList={[]} fileList={[]}
setFilesForRepresentation={[]} setFilesForRepresentation={[]}
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+1 -1
View File
@@ -1213,7 +1213,7 @@ let Enforcement_Questionnaire = (props) => {
name={"representationDocuments"} name={"representationDocuments"}
id={"representationDocuments"} id={"representationDocuments"}
label={t("myrepresentations:add-files-label")} label={t("myrepresentations:add-files-label")}
ticketnumber={props.props.props.caseReference} ticketnumber={props.props.props.ticketnumber}
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.currentView.fileList props.currentView.fileList
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+1 -1
View File
@@ -1022,7 +1022,7 @@ let S78_Questionnaire = (props) => {
name={"representationDocuments"} name={"representationDocuments"}
id={"representationDocuments"} id={"representationDocuments"}
label={t("myrepresentations:add-files-label")} label={t("myrepresentations:add-files-label")}
ticketnumber={props.props.props.caseReference} ticketnumber={props.props.props.ticketnumber}
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.currentView.fileList props.currentView.fileList
components/case/summary.js
+3 -2
View File
@@ -85,6 +85,7 @@ const CaseSummary = (props) => {
currentView, currentView,
messagesObj, messagesObj,
docsOffline, docsOffline,
ticketnumber,
} = props; } = props;
const showLoginCheck = const showLoginCheck =
@@ -194,7 +195,7 @@ const CaseSummary = (props) => {
})) }))
: currentType == "directResultsObj" : currentType == "directResultsObj"
? (casesObj = jsonpath({ ? (casesObj = jsonpath({
path: '$..[?(@ && @.ticketnumber=="' + caseReference + '")]', path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
json: setCaseQueryObj, json: setCaseQueryObj,
eval: true, eval: true,
})) }))
@@ -472,7 +473,7 @@ const CaseSummary = (props) => {
? casesObj.pinswg_title ? casesObj.pinswg_title
: currentType == : currentType ==
"directResultsObj" "directResultsObj"
? detailsObj.pinswg_name ? casesObj.ticketnumber
: casesObj.reference, : casesObj.reference,
}, },
}} }}
components/myportal/topthree.js
+5 -3
View File
@@ -207,11 +207,11 @@ const TopThree = (props) => {
showTopThreeArr[key].incidentid showTopThreeArr[key].incidentid
: router.locale == "cy" : router.locale == "cy"
? "/fymhorth/achos/" + ? "/fymhorth/achos/" +
showTopThreeArr[key].pinswg_title + showTopThreeArr[key].ticketnumber +
"?key=" + "?key=" +
topThreeType topThreeType
: "/myportal/case/" + : "/myportal/case/" +
showTopThreeArr[key].pinswg_title + showTopThreeArr[key].ticketnumber +
"?key=" + "?key=" +
topThreeType topThreeType
} }
@@ -257,7 +257,9 @@ const TopThree = (props) => {
> >
{topThreeType != "watchedCases" {topThreeType != "watchedCases"
? topThreeType != "myRepresentations" ? topThreeType != "myRepresentations"
? showTopThreeArr[key].ticketnumber ? topThreeType == "mySubmittedReps"
? showTopThreeArr[key].pinswg_title
: showTopThreeArr[key].ticketnumber
: showTopThreeArr[key][ : showTopThreeArr[key][
"_pinswg_case_value@OData.Community.Display.V1.FormattedValue" "_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
] ]
components/myportal/topthree_reps.js
+1 -1
View File
@@ -201,7 +201,7 @@ const TopThree = (props) => {
? "/fymhorth/representation" ? "/fymhorth/representation"
: "/myportal/representation", : "/myportal/representation",
query: { query: {
case: showTopThreeArr[key].caseRef, case: showTopThreeArr[key].ticketnumber,
state: "edit", state: "edit",
created: created:
showTopThreeArr[key].repfile_name, showTopThreeArr[key].repfile_name,
components/myportal/viewall.js
+3
View File
@@ -268,6 +268,9 @@ const ViewAllResults = (props) => {
? currentView.viewKey == ? currentView.viewKey ==
"myRepresentations" "myRepresentations"
? resultsArr[key].caseRef ? resultsArr[key].caseRef
: currentView.viewKey ==
"mySubmittedReps"
? resultsArr[key].pinswg_title
: resultsArr[key].ticketnumber : resultsArr[key].ticketnumber
: resultsArr[key][ : resultsArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
components/representation.js
+1
View File
@@ -22,6 +22,7 @@ const CaseRepresentation = (props) => {
watchedCases={props.watchedCases} watchedCases={props.watchedCases}
awaitingSubmission={props.awaitingSubmission} awaitingSubmission={props.awaitingSubmission}
caseReference={props.caseReference} caseReference={props.caseReference}
ticketnumber={props.ticketnumber}
currentType={props.currentType} currentType={props.currentType}
searchResultsObj={props.searchResultsObj} searchResultsObj={props.searchResultsObj}
searchDetailsObj={props.searchDetailsObj} searchDetailsObj={props.searchDetailsObj}
pages/api/file/generatepdf.js
+1 -1
View File
@@ -166,7 +166,7 @@ export default async function handler(req, res) {
var containerID = reqBodyobj.containerID; var containerID = reqBodyobj.containerID;
var casefolderID = reqBodyobj.casefolderID; var casefolderID = reqBodyobj.casefolderID;
var caseRef = reqBodyobj.caseRef; var caseRef = reqBodyobj.ticketnumber;
var representationType = reqBodyobj.representationType; var representationType = reqBodyobj.representationType;
var repRaiser = reqBodyobj.lastname; var repRaiser = reqBodyobj.lastname;
var localeSelect = reqBodyobj.locale; var localeSelect = reqBodyobj.locale;
pages/myportal/case/[ticketnumber].js
+5 -2
View File
@@ -104,6 +104,9 @@ const CaseHome = (props) => {
caseReference={ caseReference={
props.currentView.caseReference.currentReference props.currentView.caseReference.currentReference
} }
ticketnumber={
props.currentView.caseReference.ticketnumber
}
currentType={props.currentType} currentType={props.currentType}
appealTypeID={ appealTypeID={
props.currentView.caseReference.appealType props.currentView.caseReference.appealType
@@ -384,12 +387,12 @@ const getDetails = (resultsObj, detailsType) => {
caseID = data.pinswg_title; caseID = data.pinswg_title;
break; break;
case "myWatchedCases": case "myWatchedCases":
case "mySubmittedReps":
caseID = caseID =
data[ data[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]; ];
break; break;
case "mySubmittedReps":
case "awaitingSubmission": case "awaitingSubmission":
case "myRepresentations": case "myRepresentations":
caseID = data.ticketnumber; caseID = data.ticketnumber;
@@ -415,12 +418,12 @@ const getDetails = (resultsObj, detailsType) => {
caseID = searchDetail.pinswg_title; caseID = searchDetail.pinswg_title;
break; break;
case "myWatchedCases": case "myWatchedCases":
case "mySubmittedReps":
caseID = caseID =
searchDetail[ searchDetail[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]; ];
break; break;
case "mySubmittedReps":
case "awaitingSubmission": case "awaitingSubmission":
caseID = searchDetail.ticketnumber; caseID = searchDetail.ticketnumber;
break; break;
pages/myportal/representation.js
+3
View File
@@ -190,6 +190,9 @@ const RepresentationF = (props) => {
caseReference={ caseReference={
props.currentView.caseReference.currentReference props.currentView.caseReference.currentReference
} }
ticketnumber={
props.currentView.caseReference.ticketnumber
}
currentType={ currentType={
props.currentView.caseReference.currentType props.currentView.caseReference.currentType
} }