From f5028d1d8ba3b7cf60fbff4949aa0a18862cebad Mon Sep 17 00:00:00 2001 From: channa-patil Date: Thu, 29 Aug 2024 13:57:07 +0100 Subject: [PATCH 01/10] PRL-5904 - added check application for case submitted with hwf & when case is moved to submitted state after the payment --- ...a-task-cancellation-privatelaw-prlapps.dmn | 25 +- .../wa-task-completion-privatelaw-prlapps.dmn | 13 +- ...-task-configuration-privatelaw-prlapps.dmn | 27 +- .../wa-task-initiation-privatelaw-prlapps.dmn | 474 +++++++++++++++++- ...wa-task-permissions-privatelaw-prlapps.dmn | 4 +- .../wa-task-types-privatelaw-prlapps.dmn | 14 +- 6 files changed, 546 insertions(+), 11 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn index 06d3c352..929aa11a 100644 --- a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -343,6 +343,29 @@ "reviewAddtlApp" + + + "SUBMITTED_NOT_PAID" + + + "hwfProcessCaseUpdate" + + + + + + "Cancel" + + + + + + + + + "applicationHwfCheck" + + diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index ae2d67f3..fe4680cd 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -669,6 +669,17 @@ "Auto" + + + "hwfProcessCaseUpdate" + + + "checkHwfApplicationC100" + + + "Auto" + + "manageOrders","serviceOfApplication","createBundle","adminEditAndApproveAnOrder","returnApplication","sendOrReplyToMessages","adminRemoveLegalRepresentativeC100","adminRemoveLegalRepresentativeFL401","c100ManageFlags","fl401ManageFlags","statementOfService","issueAndSendToLocalCourtCallback","confidentialityCheck" diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 0626c99e..0ae6a643 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -293,7 +293,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "checkApplicationC100","checkApplicationResubmittedC100","checkApplicationFL401","checkApplicationResubmittedFL401","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","produceHearingBundleC100","produceHearingBundleFL100","updateHearingActualsC100","updateHearingActualsFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","confidentialCheckSOA","recreateApplicationPack","replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","completefl416AndServe","listWithoutNoticeHearingC100","listOnNoticeHearingFL401","reviewLangAndSmReq" + "checkApplicationC100","checkApplicationResubmittedC100","checkApplicationFL401","checkApplicationResubmittedFL401","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","produceHearingBundleC100","produceHearingBundleFL100","updateHearingActualsC100","updateHearingActualsFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","confidentialCheckSOA","recreateApplicationPack","replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","completefl416AndServe","listWithoutNoticeHearingC100","listOnNoticeHearingFL401","reviewLangAndSmReq","checkHwfApplicationC100" "dueDateIntervalDays" @@ -531,7 +531,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "checkApplicationC100","checkApplicationResubmittedC100","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","gateKeeping","gateKeepingResubmitted" + "checkApplicationC100","checkApplicationResubmittedC100","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","gateKeeping","gateKeepingResubmitted","checkHwfApplicationC100" "majorPriority" @@ -738,7 +738,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "checkApplicationC100", "checkApplicationFL401", "checkApplicationResubmittedC100", "checkApplicationResubmittedFL401" + "checkApplicationC100", "checkApplicationFL401", "checkApplicationResubmittedC100", "checkApplicationResubmittedFL401", "checkHwfApplicationC100" "workType" @@ -825,7 +825,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"reviewSpecificAccessRequestCTSC" +"reviewSpecificAccessRequestCTSC", "checkHwfApplicationC100" "roleCategory" @@ -1483,6 +1483,23 @@ taskAttributes. taskType else if(taskType != null) then taskType else null + + + + + + "checkHwfApplicationC100" + + + "description" + + + "[Check HWF application](/cases/case-details/${[CASE_REFERENCE]}#Summary)" + + + + + diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index d0e72bfb..ea8c3ec6 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -183,6 +183,18 @@ and additionalData.Data.isHearingTaskNeeded != null) then "Yes","No" + + + if(additionalData != null and additionalData.Data != null and additionalData.Data.helpWithFees + != null) then + additionalData.Data.helpWithFees + else + "" + + + "Yes","No" + + @@ -248,6 +260,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationFL401" @@ -322,6 +337,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationFL401" @@ -396,6 +414,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationFL401" @@ -470,6 +491,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationResubmittedFL401" @@ -544,6 +568,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperFL401" @@ -618,6 +645,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperFL401" @@ -692,6 +722,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperFL401" @@ -766,6 +799,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperResubmittedFL401" @@ -840,6 +876,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationC100" @@ -914,6 +953,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationC100" @@ -988,6 +1030,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationResubmittedC100" @@ -1062,6 +1107,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationC100" @@ -1136,6 +1184,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "addCaseNumber" @@ -1210,6 +1261,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "addCaseNumberResubmitted" @@ -1284,6 +1338,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperC100" @@ -1358,6 +1415,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperResubmittedC100" @@ -1432,6 +1492,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "directionOnIssue" @@ -1506,6 +1569,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "directionOnIssueResubmitted" @@ -1580,6 +1646,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "gateKeeping" @@ -1654,6 +1723,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "gateKeepingResubmitted" @@ -1728,6 +1800,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "produceHearingBundleC100" @@ -1802,6 +1877,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "produceHearingBundleFL100" @@ -1876,6 +1954,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewSolicitorOrderProvided" @@ -1950,6 +2031,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewSolicitorOrderProvided" @@ -2026,6 +2110,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "serviceOfApplicationC100" @@ -2102,6 +2189,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "serviceOfApplicationFL401" @@ -2178,6 +2268,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2254,6 +2347,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2330,6 +2426,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2406,6 +2505,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2481,6 +2583,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2556,6 +2661,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2632,6 +2740,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2708,6 +2819,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2782,6 +2896,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequestReserveListAssist" @@ -2856,6 +2973,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequest" @@ -2930,6 +3050,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createMultipleHearingRequest" @@ -3004,6 +3127,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "updateHearingActualsC100" @@ -3078,6 +3204,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "updateHearingActualsFL100" @@ -3152,6 +3281,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "requestSolicitorOrderC100" @@ -3228,6 +3360,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "requestSolicitorOrderFL100" @@ -3304,6 +3439,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewCorrespondenceC100" @@ -3380,6 +3518,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewCorrespondenceFL401" @@ -3454,6 +3595,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewAdminOrderProvided" @@ -3528,6 +3672,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewAdminOrderByManager" @@ -3602,6 +3749,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequestReserveListAssist" @@ -3676,6 +3826,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequestReserveListAssist" @@ -3750,6 +3903,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequest" @@ -3824,6 +3980,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequest" @@ -3898,6 +4057,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createMultipleHearingRequest" @@ -3972,6 +4134,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createMultipleHearingRequest" @@ -4046,6 +4211,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "removeLegalRepresentativeC100" @@ -4120,6 +4288,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "removeLegalRepresentativeFL401" @@ -4194,6 +4365,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "confidentialCheckSOA" @@ -4268,6 +4442,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceBySol" @@ -4342,6 +4519,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByLiP" @@ -4416,6 +4596,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByBailiff" @@ -4490,6 +4673,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "arrangeBailiffSOA" @@ -4564,6 +4750,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByAdmin" @@ -4638,6 +4827,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "completefl416AndServe" @@ -4712,6 +4904,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "completefl416AndServe" @@ -4786,6 +4981,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "recreateApplicationPack" @@ -4860,6 +5058,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceBySol" @@ -4934,6 +5135,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByLiP" @@ -5008,6 +5212,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByBailiff" @@ -5082,6 +5289,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "arrangeBailiffSOA" @@ -5156,6 +5366,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByAdmin" @@ -5230,6 +5443,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminFL401" @@ -5304,6 +5520,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminFL401" @@ -5378,6 +5597,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminC100" @@ -5452,6 +5674,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminC100" @@ -5526,6 +5751,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForLA" @@ -5600,6 +5828,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForLA" @@ -5674,6 +5905,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForJudiciary" @@ -5748,6 +5982,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForJudiciary" @@ -5822,6 +6059,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -5896,6 +6136,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -5970,6 +6213,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6044,6 +6290,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6118,6 +6367,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6192,6 +6444,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6266,6 +6521,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6340,6 +6598,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6414,6 +6675,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsC100" @@ -6488,6 +6752,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewInactiveRaRequestsC100" @@ -6562,6 +6829,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsFL401" @@ -6636,6 +6906,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewInactiveRaRequestsFL401" @@ -6710,6 +6983,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6784,6 +7060,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6858,6 +7137,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6932,6 +7214,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7006,6 +7291,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7080,6 +7368,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7154,6 +7445,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7228,6 +7522,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7302,6 +7599,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "listWithoutNoticeHearingC100" @@ -7376,6 +7676,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "listOnNoticeHearingFL401" @@ -7450,6 +7753,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewAdditionalApplication" @@ -7524,6 +7830,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then "Yes" + + + "reviewAdditionalApplication" @@ -7598,6 +7907,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsC100" @@ -7672,6 +7984,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsFL401" @@ -7746,6 +8061,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewLangAndSmReq" @@ -7759,6 +8077,160 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewLangAndSmReqIdent" + + + "hwfProcessCaseUpdate" + + + "SUBMITTED_PAID" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "checkApplicationC100" + + + "Check Application" + + + + + + "applicationCheck" + + + + + "citizen-case-submit" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "Yes" + + + "checkHwfApplicationC100" + + + "Check HWF application" + + + + + + "applicationHwfCheck" + + diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index 43135093..8a1fecc2 100644 --- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -599,7 +599,7 @@ CTSC task permissions "checkApplicationC100", "checkApplicationResubmittedC100", -"addCaseNumber", "addCaseNumberResubmitted" +"addCaseNumber", "addCaseNumberResubmitted", "checkHwfApplicationC100" diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 7e081684..4435d520 100644 --- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn @@ -1,5 +1,5 @@ - + @@ -561,6 +561,18 @@ "Review Language and SM requirements" + + CAHWFC100 + + + + + "checkHwfApplicationC100" + + + "Check HWF application" + + From 584feca3aac53c42258a6db23015ed0b5a02e95d Mon Sep 17 00:00:00 2001 From: channa-patil Date: Thu, 29 Aug 2024 15:07:30 +0100 Subject: [PATCH 02/10] PRL-5904 - fixed WA task is not getting created for citizen cases with hwf --- ...a-task-cancellation-privatelaw-prlapps.dmn | 23 -- ...-task-configuration-privatelaw-prlapps.dmn | 6 +- .../wa-task-initiation-privatelaw-prlapps.dmn | 328 +----------------- 3 files changed, 5 insertions(+), 352 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn index 929aa11a..93b3dd11 100644 --- a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn @@ -343,29 +343,6 @@ "reviewAddtlApp" - - - "SUBMITTED_NOT_PAID" - - - "hwfProcessCaseUpdate" - - - - - - "Cancel" - - - - - - - - - "applicationHwfCheck" - - diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 0ae6a643..b71f15a6 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -293,7 +293,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "checkApplicationC100","checkApplicationResubmittedC100","checkApplicationFL401","checkApplicationResubmittedFL401","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","produceHearingBundleC100","produceHearingBundleFL100","updateHearingActualsC100","updateHearingActualsFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","confidentialCheckSOA","recreateApplicationPack","replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","completefl416AndServe","listWithoutNoticeHearingC100","listOnNoticeHearingFL401","reviewLangAndSmReq","checkHwfApplicationC100" + "checkApplicationC100","checkApplicationResubmittedC100","checkApplicationFL401","checkApplicationResubmittedFL401","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","produceHearingBundleC100","produceHearingBundleFL100","updateHearingActualsC100","updateHearingActualsFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","confidentialCheckSOA","recreateApplicationPack","replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","completefl416AndServe","listWithoutNoticeHearingC100","listOnNoticeHearingFL401","reviewLangAndSmReq" "dueDateIntervalDays" @@ -327,7 +327,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "removeLegalRepresentativeC100","removeLegalRepresentativeFL401", "reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401" + "removeLegalRepresentativeC100","removeLegalRepresentativeFL401", "reviewDocumentsForSolAndCafcassC100", "reviewDocumentsForSolAndCafcassFL401", "checkHwfApplicationC100" "dueDateIntervalDays" @@ -1494,7 +1494,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null"description" - "[Check HWF application](/cases/case-details/${[CASE_REFERENCE]}#Summary)" + "[Check HWF application](/cases/case-details/${[CASE_REFERENCE]}#Application_)" diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index ea8c3ec6..a8f09be6 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -183,18 +183,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then "Yes","No" - - - if(additionalData != null and additionalData.Data != null and additionalData.Data.helpWithFees - != null) then - additionalData.Data.helpWithFees - else - "" - - - "Yes","No" - - @@ -260,9 +248,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationFL401" @@ -337,9 +322,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationFL401" @@ -414,9 +396,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationFL401" @@ -491,9 +470,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationResubmittedFL401" @@ -568,9 +544,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "sendToGateKeeperFL401" @@ -645,9 +618,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "sendToGateKeeperFL401" @@ -722,9 +692,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "sendToGateKeeperFL401" @@ -799,9 +766,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "sendToGateKeeperResubmittedFL401" @@ -876,9 +840,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationC100" @@ -953,9 +914,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationC100" @@ -1030,9 +988,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationResubmittedC100" @@ -1107,9 +1062,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationC100" @@ -1184,9 +1136,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "addCaseNumber" @@ -1261,9 +1210,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "addCaseNumberResubmitted" @@ -1338,9 +1284,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "sendToGateKeeperC100" @@ -1415,9 +1358,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "sendToGateKeeperResubmittedC100" @@ -1492,9 +1432,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "directionOnIssue" @@ -1569,9 +1506,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "directionOnIssueResubmitted" @@ -1646,9 +1580,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "gateKeeping" @@ -1723,9 +1654,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "gateKeepingResubmitted" @@ -1800,9 +1728,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "produceHearingBundleC100" @@ -1877,9 +1802,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "produceHearingBundleFL100" @@ -1954,9 +1876,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewSolicitorOrderProvided" @@ -2031,9 +1950,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewSolicitorOrderProvided" @@ -2110,9 +2026,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "serviceOfApplicationC100" @@ -2189,9 +2102,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "serviceOfApplicationFL401" @@ -2268,9 +2178,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderC100" @@ -2347,9 +2254,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderC100" @@ -2426,9 +2330,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderFL401" @@ -2505,9 +2406,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderFL401" @@ -2583,9 +2481,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderC100" @@ -2661,9 +2556,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderC100" @@ -2740,9 +2632,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderFL401" @@ -2819,9 +2708,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "adminServeOrderFL401" @@ -2896,9 +2782,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createHearingRequestReserveListAssist" @@ -2973,9 +2856,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createHearingRequest" @@ -3050,9 +2930,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createMultipleHearingRequest" @@ -3127,9 +3004,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "updateHearingActualsC100" @@ -3204,9 +3078,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "updateHearingActualsFL100" @@ -3281,9 +3152,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "requestSolicitorOrderC100" @@ -3360,9 +3228,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "requestSolicitorOrderFL100" @@ -3439,9 +3304,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewCorrespondenceC100" @@ -3518,9 +3380,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewCorrespondenceFL401" @@ -3595,9 +3454,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewAdminOrderProvided" @@ -3672,9 +3528,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewAdminOrderByManager" @@ -3749,9 +3602,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createHearingRequestReserveListAssist" @@ -3826,9 +3676,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createHearingRequestReserveListAssist" @@ -3903,9 +3750,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createHearingRequest" @@ -3980,9 +3824,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createHearingRequest" @@ -4057,9 +3898,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createMultipleHearingRequest" @@ -4134,9 +3972,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "createMultipleHearingRequest" @@ -4211,9 +4046,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "removeLegalRepresentativeC100" @@ -4288,9 +4120,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "removeLegalRepresentativeFL401" @@ -4365,9 +4194,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "confidentialCheckSOA" @@ -4442,9 +4268,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceBySol" @@ -4519,9 +4342,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceByLiP" @@ -4596,9 +4416,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceByBailiff" @@ -4673,9 +4490,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "arrangeBailiffSOA" @@ -4750,9 +4564,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceByAdmin" @@ -4827,9 +4638,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "completefl416AndServe" @@ -4904,9 +4712,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "completefl416AndServe" @@ -4981,9 +4786,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "recreateApplicationPack" @@ -5058,9 +4860,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceBySol" @@ -5135,9 +4934,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceByLiP" @@ -5212,9 +5008,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceByBailiff" @@ -5289,9 +5082,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "arrangeBailiffSOA" @@ -5366,9 +5156,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "appStatementOfServiceByAdmin" @@ -5443,9 +5230,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForCourtAdminFL401" @@ -5520,9 +5304,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForCourtAdminFL401" @@ -5597,9 +5378,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForCourtAdminC100" @@ -5674,9 +5452,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForCourtAdminC100" @@ -5751,9 +5526,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForLA" @@ -5828,9 +5600,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForLA" @@ -5905,9 +5674,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForJudiciary" @@ -5982,9 +5748,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "replyToMessageForJudiciary" @@ -6059,9 +5822,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -6136,9 +5896,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassFL401" @@ -6213,9 +5970,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -6290,9 +6044,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassFL401" @@ -6367,9 +6118,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -6444,9 +6192,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassFL401" @@ -6521,9 +6266,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -6598,9 +6340,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassFL401" @@ -6675,9 +6414,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewRaRequestsC100" @@ -6752,9 +6488,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewInactiveRaRequestsC100" @@ -6829,9 +6562,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewRaRequestsFL401" @@ -6906,9 +6636,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewInactiveRaRequestsFL401" @@ -6983,9 +6710,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -7060,9 +6784,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassFL401" @@ -7137,9 +6858,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -7214,9 +6932,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -7291,9 +7006,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -7368,9 +7080,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -7445,9 +7154,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -7522,9 +7228,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewDocumentsForSolAndCafcassC100" @@ -7599,9 +7302,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "listWithoutNoticeHearingC100" @@ -7676,9 +7376,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "listOnNoticeHearingFL401" @@ -7753,9 +7450,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewAdditionalApplication" @@ -7830,9 +7524,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then "Yes" - - - "reviewAdditionalApplication" @@ -7907,9 +7598,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewRaRequestsC100" @@ -7984,9 +7672,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewRaRequestsFL401" @@ -8061,9 +7746,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "reviewLangAndSmReq" @@ -8138,9 +7820,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - - "checkApplicationC100" @@ -8156,10 +7835,10 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "citizen-case-submit" + "citizenCaseSubmitWithHWF" - + "SUBMITTED_NOT_PAID" @@ -8215,9 +7894,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then - - "Yes" - "checkHwfApplicationC100" From 5b85632a5af6fc2c67c784ceabcfc5b131ac783c Mon Sep 17 00:00:00 2001 From: channa-patil Date: Fri, 30 Aug 2024 11:12:31 +0100 Subject: [PATCH 03/10] PRL-4023,PRL-4024 - Added new WA tasks for AWP submitted with/without help with fees --- ...a-task-cancellation-privatelaw-prlapps.dmn | 69 ++++ .../wa-task-completion-privatelaw-prlapps.dmn | 11 - ...-task-configuration-privatelaw-prlapps.dmn | 12 +- .../wa-task-initiation-privatelaw-prlapps.dmn | 372 +++++++++++------- ...wa-task-permissions-privatelaw-prlapps.dmn | 2 +- .../wa-task-types-privatelaw-prlapps.dmn | 12 + 6 files changed, 311 insertions(+), 167 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn index 93b3dd11..16919d5f 100644 --- a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn @@ -343,6 +343,75 @@ "reviewAddtlApp" + + + + + + "hwfProcessCaseUpdate" + + + + + + "Cancel" + + + + + + + + + "applicationHwfCheck" + + + + + + + + "processHwfUpdateAwpStatus" + + + + + + "Cancel" + + + + + + + + + "checkAwpHwfCitizen" + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn index fe4680cd..4580e717 100644 --- a/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-completion-privatelaw-prlapps.dmn @@ -669,17 +669,6 @@ "Auto" - - - "hwfProcessCaseUpdate" - - - "checkHwfApplicationC100" - - - "Auto" - - "manageOrders","serviceOfApplication","createBundle","adminEditAndApproveAnOrder","returnApplication","sendOrReplyToMessages","adminRemoveLegalRepresentativeC100","adminRemoveLegalRepresentativeFL401","c100ManageFlags","fl401ManageFlags","statementOfService","issueAndSendToLocalCourtCallback","confidentialityCheck" diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index b71f15a6..38fbeb45 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -310,7 +310,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","reviewAdminOrderProvided","reviewAdminOrderByManager","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","reviewAdditionalApplication" + "directionOnIssue","directionOnIssueResubmitted","gateKeeping","gateKeepingResubmitted","serviceOfApplicationC100","serviceOfApplicationFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","reviewAdminOrderProvided","reviewAdminOrderByManager","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","reviewAdditionalApplication","checkAwpHwfCitizen" "dueDateIntervalDays" @@ -361,7 +361,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","serviceOfApplicationC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100","reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewAdminOrderByManager","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe","reviewAdditionalApplication","reviewLangAndSmReq" + "checkApplicationFL401","checkApplicationResubmittedFL401","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationFL401","adminServeOrderFL401","updateHearingActualsFL401","requestSolicitorOrderFL401","reviewSpecificAccessRequestAdmin","checkApplicationC100","checkApplicationResubmittedC100","addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","serviceOfApplicationC100","adminServeOrderC100","updateHearingActualsC100","requestSolicitorOrderC100","reviewSpecificAccessRequestCTSC","reviewAdminOrderProvided","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","replyToMessageForCourtAdminFL401","replyToMessageForCourtAdminC100","replyToMessageForJudiciary","reviewDocumentsForSolAndCafcassC100","reviewDocumentsForSolAndCafcassFL401","replyToMessageForLA","reviewAdminOrderByManager","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe","reviewAdditionalApplication","reviewLangAndSmReq","checkAwpHwfCitizen" "priorityDateOriginRef" @@ -568,7 +568,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "reviewSolicitorOrderProvided","reviewAdminOrderProvided","confidentialCheckSOA","recreateApplicationPack","replyToMessageForJudiciary","reviewAdminOrderByManager","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist" + "reviewSolicitorOrderProvided","reviewAdminOrderProvided","confidentialCheckSOA","recreateApplicationPack","replyToMessageForJudiciary","reviewAdminOrderByManager","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe","replyToMessageForLA","createHearingRequest","createMultipleHearingRequest","createHearingRequestReserveListAssist","checkAwpHwfCitizen" "majorPriority" @@ -687,7 +687,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe","listWithoutNoticeHearingC100","listOnNoticeHearingFL401","reviewAdditionalApplication","reviewLangAndSmReq" + "addCaseNumber","addCaseNumberResubmitted","sendToGateKeeperC100","sendToGateKeeperResubmittedC100","sendToGateKeeperFL401","sendToGateKeeperResubmittedFL401","serviceOfApplicationC100","adminServeOrderC100","serviceOfApplicationFL401","adminServeOrderFL401","requestSolicitorOrderC100","requestSolicitorOrderFL401","reviewCorrespondenceC100","reviewCorrespondenceFL401","removeLegalRepresentativeC100","removeLegalRepresentativeFL401","confidentialCheckSOA","reviewDocumentsForSolAndCafcassC100","reviewDocumentsForSolAndCafcassFL401","replyToMessageForCourtAdminC100","replyToMessageForLA","replyToMessageForJudiciary","reviewRaRequestsC100","reviewRaRequestsFL401","reviewInactiveRaRequestsC100","reviewInactiveRaRequestsFL401","appStatementOfServiceBySol","appStatementOfServiceByLiP","appStatementOfServiceByBailiff","arrangeBailiffSOA","appStatementOfServiceByAdmin","completefl416AndServe","listWithoutNoticeHearingC100","listOnNoticeHearingFL401","reviewAdditionalApplication","reviewLangAndSmReq","checkAwpHwfCitizen" "workType" @@ -825,7 +825,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null "checkApplicationC100", "checkApplicationResubmittedC100", "addCaseNumber", "addCaseNumberResubmitted", -"reviewSpecificAccessRequestCTSC", "checkHwfApplicationC100" +"reviewSpecificAccessRequestCTSC", "checkHwfApplicationC100", "checkAwpHwfCitizen" "roleCategory" @@ -1454,7 +1454,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null - "reviewAdditionalApplication" + "reviewAdditionalApplication", "checkAwpHwfCitizen" "description" diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index a8f09be6..de8930f1 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -1003,7 +1003,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then - "citizen-case-submit" + "citizen-case-submit", "hwfProcessCaseUpdate" "SUBMITTED_PAID" @@ -1075,6 +1075,80 @@ and additionalData.Data.isHearingTaskNeeded != null) then "applicationCheck" + + + "citizenCaseSubmitWithHWF" + + + "SUBMITTED_NOT_PAID" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "checkHwfApplicationC100" + + + "Check HWF application" + + + + + + "applicationHwfCheck" + + "issueAndSendToLocalCourtCallback" @@ -7537,6 +7611,154 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewAddtlApp" + + + "citizenAwpCreate", "processHwfUpdateAwpStatus" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "reviewAdditionalApplication" + + + "Review additional application" + + + + + + "reviewAddtlAppCitizen" + + + + + "citizenAwpHwfCreate" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "checkAwpHwfCitizen" + + + "Check HWF on additional application" + + + + + + "checkAwpHwfCitizen" + + "createWaTaskForCtscCaseFlags" @@ -7759,154 +7981,6 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewLangAndSmReqIdent" - - - "hwfProcessCaseUpdate" - - - "SUBMITTED_PAID" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "checkApplicationC100" - - - "Check Application" - - - - - - "applicationCheck" - - - - - "citizenCaseSubmitWithHWF" - - - "SUBMITTED_NOT_PAID" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "checkHwfApplicationC100" - - - "Check HWF application" - - - - - - "applicationHwfCheck" - - diff --git a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn index 8a1fecc2..ab0049b0 100644 --- a/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-permissions-privatelaw-prlapps.dmn @@ -599,7 +599,7 @@ CTSC task permissions "checkApplicationC100", "checkApplicationResubmittedC100", -"addCaseNumber", "addCaseNumberResubmitted", "checkHwfApplicationC100" +"addCaseNumber", "addCaseNumberResubmitted", "checkHwfApplicationC100","checkAwpHwfCitizen" diff --git a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn index 4435d520..970832a1 100644 --- a/src/main/resources/wa-task-types-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-types-privatelaw-prlapps.dmn @@ -573,6 +573,18 @@ "Check HWF application" + + CADDHWF + + + + + "checkAwpHwfCitizen" + + + "Check HWF on additional application" + + From 78392e1a4a4e95be999dfe6a36a84f7f8af108dc Mon Sep 17 00:00:00 2001 From: channa-patil Date: Fri, 30 Aug 2024 18:43:34 +0100 Subject: [PATCH 04/10] PRL-4023,PRL-4024 - Added new WA tasks for AWP submitted with/without help with fees --- ...a-task-cancellation-privatelaw-prlapps.dmn | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn index 16919d5f..ec473979 100644 --- a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn @@ -389,29 +389,6 @@ "checkAwpHwfCitizen" - - - - - - - - - - - - - - - - - - - - - - - From 4b2449d65dfefa6dc6520e12d7591b414b8cd816 Mon Sep 17 00:00:00 2001 From: channa-patil Date: Thu, 5 Sep 2024 11:41:58 +0100 Subject: [PATCH 05/10] PRL-5936,PRL-6027 - Added WA changes to trigger check application or awp after process hwf event is triggered --- ...a-task-cancellation-privatelaw-prlapps.dmn | 4 +- .../wa-task-initiation-privatelaw-prlapps.dmn | 481 ++++++++++++++++++ 2 files changed, 483 insertions(+), 2 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn index ec473979..fcb4b11f 100644 --- a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn @@ -348,7 +348,7 @@ - "hwfProcessCaseUpdate" + "hwfProcessCaseUpdate","processUrgentHelpWithFees" @@ -371,7 +371,7 @@ - "processHwfUpdateAwpStatus" + "processHwfUpdateAwpStatus","processUrgentHelpWithFees" diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index de8930f1..b8a4cfed 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -183,6 +183,18 @@ and additionalData.Data.isHearingTaskNeeded != null) then "Yes","No" + + + if(additionalData != null and additionalData.Data != null and additionalData.Data.isTheCaseInDraftState + != null) then + additionalData.Data.isTheCaseInDraftState + else + "" + + + "Yes","No" + + @@ -248,6 +260,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationFL401" @@ -322,6 +337,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationFL401" @@ -396,6 +414,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationFL401" @@ -470,6 +491,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationResubmittedFL401" @@ -544,6 +568,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperFL401" @@ -618,6 +645,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperFL401" @@ -692,6 +722,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperFL401" @@ -766,6 +799,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperResubmittedFL401" @@ -840,6 +876,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationC100" @@ -914,6 +953,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationC100" @@ -988,6 +1030,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationResubmittedC100" @@ -1062,6 +1107,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkApplicationC100" @@ -1075,6 +1123,83 @@ and additionalData.Data.isHearingTaskNeeded != null) then "applicationCheck" + + + "processUrgentHelpWithFees" + + + "SUBMITTED_PAID" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "Yes" + + + "checkApplicationC100" + + + "Check Application" + + + + + + "applicationCheck" + + "citizenCaseSubmitWithHWF" @@ -1136,6 +1261,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkHwfApplicationC100" @@ -1210,6 +1338,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "addCaseNumber" @@ -1284,6 +1415,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "addCaseNumberResubmitted" @@ -1358,6 +1492,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperC100" @@ -1432,6 +1569,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "sendToGateKeeperResubmittedC100" @@ -1506,6 +1646,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "directionOnIssue" @@ -1580,6 +1723,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "directionOnIssueResubmitted" @@ -1654,6 +1800,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "gateKeeping" @@ -1728,6 +1877,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "gateKeepingResubmitted" @@ -1802,6 +1954,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "produceHearingBundleC100" @@ -1876,6 +2031,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "produceHearingBundleFL100" @@ -1950,6 +2108,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewSolicitorOrderProvided" @@ -2024,6 +2185,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewSolicitorOrderProvided" @@ -2100,6 +2264,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "serviceOfApplicationC100" @@ -2176,6 +2343,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "serviceOfApplicationFL401" @@ -2252,6 +2422,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2328,6 +2501,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2404,6 +2580,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2480,6 +2659,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2555,6 +2737,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2630,6 +2815,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderC100" @@ -2706,6 +2894,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2782,6 +2973,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "adminServeOrderFL401" @@ -2856,6 +3050,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequestReserveListAssist" @@ -2930,6 +3127,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequest" @@ -3004,6 +3204,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createMultipleHearingRequest" @@ -3078,6 +3281,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "updateHearingActualsC100" @@ -3152,6 +3358,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "updateHearingActualsFL100" @@ -3226,6 +3435,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "requestSolicitorOrderC100" @@ -3302,6 +3514,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "requestSolicitorOrderFL100" @@ -3378,6 +3593,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewCorrespondenceC100" @@ -3454,6 +3672,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewCorrespondenceFL401" @@ -3528,6 +3749,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewAdminOrderProvided" @@ -3602,6 +3826,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewAdminOrderByManager" @@ -3676,6 +3903,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequestReserveListAssist" @@ -3750,6 +3980,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequestReserveListAssist" @@ -3824,6 +4057,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequest" @@ -3898,6 +4134,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createHearingRequest" @@ -3972,6 +4211,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createMultipleHearingRequest" @@ -4046,6 +4288,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "createMultipleHearingRequest" @@ -4120,6 +4365,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "removeLegalRepresentativeC100" @@ -4194,6 +4442,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "removeLegalRepresentativeFL401" @@ -4268,6 +4519,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "confidentialCheckSOA" @@ -4342,6 +4596,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceBySol" @@ -4416,6 +4673,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByLiP" @@ -4490,6 +4750,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByBailiff" @@ -4564,6 +4827,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "arrangeBailiffSOA" @@ -4638,6 +4904,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByAdmin" @@ -4712,6 +4981,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "completefl416AndServe" @@ -4786,6 +5058,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "completefl416AndServe" @@ -4860,6 +5135,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "recreateApplicationPack" @@ -4934,6 +5212,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceBySol" @@ -5008,6 +5289,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByLiP" @@ -5082,6 +5366,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByBailiff" @@ -5156,6 +5443,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "arrangeBailiffSOA" @@ -5230,6 +5520,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "appStatementOfServiceByAdmin" @@ -5304,6 +5597,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminFL401" @@ -5378,6 +5674,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminFL401" @@ -5452,6 +5751,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminC100" @@ -5526,6 +5828,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForCourtAdminC100" @@ -5600,6 +5905,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForLA" @@ -5674,6 +5982,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForLA" @@ -5748,6 +6059,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForJudiciary" @@ -5822,6 +6136,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "replyToMessageForJudiciary" @@ -5896,6 +6213,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -5970,6 +6290,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6044,6 +6367,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6118,6 +6444,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6192,6 +6521,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6266,6 +6598,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6340,6 +6675,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6414,6 +6752,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6488,6 +6829,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsC100" @@ -6562,6 +6906,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewInactiveRaRequestsC100" @@ -6636,6 +6983,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsFL401" @@ -6710,6 +7060,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewInactiveRaRequestsFL401" @@ -6784,6 +7137,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -6858,6 +7214,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassFL401" @@ -6932,6 +7291,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7006,6 +7368,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7080,6 +7445,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7154,6 +7522,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7228,6 +7599,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7302,6 +7676,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewDocumentsForSolAndCafcassC100" @@ -7376,6 +7753,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "listWithoutNoticeHearingC100" @@ -7450,6 +7830,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "listOnNoticeHearingFL401" @@ -7524,6 +7907,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewAdditionalApplication" @@ -7598,6 +7984,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then "Yes" + + + "reviewAdditionalApplication" @@ -7672,6 +8061,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewAdditionalApplication" @@ -7685,6 +8077,83 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewAddtlAppCitizen" + + + "processUrgentHelpWithFees" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "No" + + + "reviewAdditionalApplication" + + + "Review additional application" + + + + + + "reviewAddtlAppCitizen" + + "citizenAwpHwfCreate" @@ -7746,6 +8215,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "checkAwpHwfCitizen" @@ -7820,6 +8292,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsC100" @@ -7894,6 +8369,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewRaRequestsFL401" @@ -7968,6 +8446,9 @@ and additionalData.Data.isHearingTaskNeeded != null) then + + + "reviewLangAndSmReq" From bfaa48c13676cd049aa8c3dde7fc239aa933f287 Mon Sep 17 00:00:00 2001 From: channa-patil Date: Thu, 5 Sep 2024 12:13:48 +0100 Subject: [PATCH 06/10] PRL-4023,PRL-4024,PRL-5904,PRL-5936,PRL-6027 - Added test cases for the new WA changes config --- .../dmn/CamundaTaskCancellationTest.java | 59 +++++++++-- .../dmn/CamundaTaskConfigurationTest.java | 8 +- .../dmn/CamundaTaskInitiationTest.java | 100 +++++++++++++++++- .../dmn/CamundaTaskTypeFilterTest.java | 10 +- 4 files changed, 162 insertions(+), 15 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java index 7b1e34d8..88b2b3da 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java @@ -137,17 +137,54 @@ static Stream scenarioProvider() { ) ) ), - Arguments.of( - null, - "hmcCaseUpdPrepForHearing", - null, - List.of( - Map.of( - "action", "Cancel", - "processCategories", "createHearingRequest" - ) - ) + Arguments.of( + null, + "hmcCaseUpdPrepForHearing", + null, + List.of( + Map.of( + "action", "Cancel", + "processCategories", "createHearingRequest" + ) + ) + ), + Arguments.of( + null, + "hwfProcessCaseUpdate", + null, + List.of( + Map.of( + "action", "Cancel", + "processCategories", "applicationHwfCheck" + ) + ) + ), + Arguments.of( + null, + "processHwfUpdateAwpStatus", + null, + List.of( + Map.of( + "action", "Cancel", + "processCategories", "checkAwpHwfCitizen" + ) + ) + ), + Arguments.of( + null, + "processUrgentHelpWithFees", + null, + List.of( + Map.of( + "action", "Cancel", + "processCategories", "applicationHwfCheck" + ), + Map.of( + "action", "Cancel", + "processCategories", "checkAwpHwfCitizen" + ) ) + ) ); } @@ -173,7 +210,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(3)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(14)); + assertThat(logic.getRules().size(), is(16)); } } diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java index 2256f622..2c3c22ed 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java @@ -35,7 +35,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(2)); assertThat(logic.getOutputs().size(), is(3)); - assertThat(logic.getRules().size(), is(86)); + assertThat(logic.getRules().size(), is(87)); } @Test @@ -1635,6 +1635,12 @@ private static String getDescriptionBasedOnTaskType(String taskType) { case "reviewLangAndSmReq": return "[Review case notes](/cases/case-details/${[CASE_REFERENCE]}#Case%20Notes)"; + case "checkAwpHwfCitizen": + return "[Review other applications](/cases/case-details/${[CASE_REFERENCE]}#Other%20applications)"; + + case "checkHwfApplicationC100": + return "[Check HWF application](/cases/case-details/${[CASE_REFERENCE]}#Application_)"; + default: break; } diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java index c0e6738d..706d08ab 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java @@ -35,9 +35,9 @@ public static void initialization() { void if_this_test_fails_needs_updating_with_your_changes() { //The purpose of this test is to prevent adding new rows without being tested DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); - assertThat(logic.getInputs().size(), is(20)); + assertThat(logic.getInputs().size(), is(21)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(102)); + assertThat(logic.getRules().size(), is(107)); } static Stream scenarioProvider() { @@ -1074,6 +1074,102 @@ static Stream scenarioProvider() { "processCategories", "reviewLangAndSmReqIdent" ) ) + ), + Arguments.of( + "citizenCaseSubmitWithHWF", + "SUBMITTED_NOT_PAID", + null, + singletonList( + Map.of( + "taskId", "checkHwfApplicationC100", + "name", "Check HWF application", + "processCategories", "applicationHwfCheck" + ) + ) + ), + Arguments.of( + "hwfProcessCaseUpdate", + "SUBMITTED_PAID", + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"caseTypeOfApplication\":\"" + "" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "taskId", "checkApplicationC100", + "name", "Check Application", + "processCategories", "applicationCheck" + ) + ) + ), + Arguments.of( + "processUrgentHelpWithFees", + "SUBMITTED_PAID", + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"isTheCaseInDraftState\":\"" + "Yes" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "taskId", "checkApplicationC100", + "name", "Check Application", + "processCategories", "applicationCheck" + ) + ) + ), + Arguments.of( + "citizenAwpCreate", + null, + null, + singletonList( + Map.of( + "taskId", "reviewAdditionalApplication", + "name", "Review additional application", + "processCategories", "reviewAddtlAppCitizen" + ) + ) + ), + Arguments.of( + "citizenAwpHwfCreate", + null, + null, + singletonList( + Map.of( + "taskId", "checkAwpHwfCitizen", + "name", "Check HWF on additional application", + "processCategories", "checkAwpHwfCitizen" + ) + ) + ), + Arguments.of( + "processHwfUpdateAwpStatus", + null, + null, + singletonList( + Map.of( + "taskId", "reviewAdditionalApplication", + "name", "Review additional application", + "processCategories", "reviewAddtlAppCitizen" + ) + ) + ), + Arguments.of( + "processUrgentHelpWithFees", + null, + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"isTheCaseInDraftState\":\"" + "No" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "taskId", "reviewAdditionalApplication", + "name", "Review additional application", + "processCategories", "reviewAddtlAppCitizen" + ) + ) ) ); } diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java index 60755b3c..c9f7e04a 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskTypeFilterTest.java @@ -212,6 +212,14 @@ static Stream scenarioProvider() { Map.of( "taskTypeId", "reviewLangAndSmReq", "taskTypeName", "Review Language and SM requirements" + ), + Map.of( + "taskTypeId", "checkHwfApplicationC100", + "taskTypeName", "Check HWF application" + ), + Map.of( + "taskTypeId", "checkAwpHwfCitizen", + "taskTypeName", "Check HWF on additional application" ) ); return Stream.of( @@ -237,6 +245,6 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(1)); assertThat(logic.getOutputs().size(), is(2)); - assertThat(logic.getRules().size(), is(46)); + assertThat(logic.getRules().size(), is(48)); } } From e45260cf8c7b72c0c78740f5e4e983d0fe00e9b0 Mon Sep 17 00:00:00 2001 From: channa-patil Date: Mon, 9 Sep 2024 15:48:20 +0100 Subject: [PATCH 07/10] PRL-4023,PRL-4024 - Citizen AWP WA task name changes --- ...wa-task-configuration-privatelaw-prlapps.dmn | 17 +++++++++++++++++ .../dmn/CamundaTaskConfigurationTest.java | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn index 38fbeb45..4be4a54d 100644 --- a/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-configuration-privatelaw-prlapps.dmn @@ -682,6 +682,23 @@ taskAttributes. taskType else if(taskType != null) then taskType else null"false" + + + + + + "checkAwpHwfCitizen" + + + "title" + + + if(caseData.awpHwfRefNo !=null) then (taskAttributes.name + " - " + caseData.awpHwfRefNo) else taskAttributes.name + + + "false" + + diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java index 2c3c22ed..c7f88f5c 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java @@ -35,7 +35,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(2)); assertThat(logic.getOutputs().size(), is(3)); - assertThat(logic.getRules().size(), is(87)); + assertThat(logic.getRules().size(), is(88)); } @Test From 5c2e739a3a9975396a4b4d997f6524b87efd7b47 Mon Sep 17 00:00:00 2001 From: alokDatta Date: Mon, 9 Sep 2024 21:39:08 +0100 Subject: [PATCH 08/10] Changes for Review documents uploaded by CourtNav --- .../wa-task-initiation-privatelaw-prlapps.dmn | 77 +++++++++++++++++++ .../dmn/CamundaTaskInitiationTest.java | 19 ++++- 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index b8a4cfed..3ae26d60 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -8462,6 +8462,83 @@ and additionalData.Data.isHearingTaskNeeded != null) then "reviewLangAndSmReqIdent" + + + "courtnav-document-upload" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "COURTNAV" + + + "TRUE" + + + + + + + + + "reviewDocumentsForSolAndCafcassFL401" + + + "Review Documents" + + + + + + "reviewDocsFL401" + + diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java index 706d08ab..d5cd3c32 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java @@ -37,7 +37,7 @@ void if_this_test_fails_needs_updating_with_your_changes() { DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic(); assertThat(logic.getInputs().size(), is(21)); assertThat(logic.getOutputs().size(), is(4)); - assertThat(logic.getRules().size(), is(107)); + assertThat(logic.getRules().size(), is(108)); } static Stream scenarioProvider() { @@ -1170,6 +1170,23 @@ static Stream scenarioProvider() { "processCategories", "reviewAddtlAppCitizen" ) ) + ), + Arguments.of( + "courtnav-document-upload", + null, + mapAdditionalData("{\n" + + " \"Data\":{\n" + + " \"manageDocumentsTriggeredBy\":\"" + "COURTNAV" + "\"\n," + + " \"manageDocumentsRestrictedFlag\":\"" + "TRUE" + "\"\n" + + " }" + + "}"), + singletonList( + Map.of( + "taskId", "reviewDocumentsForSolAndCafcassFL401", + "name", "Review Documents", + "processCategories", "reviewDocsFL401" + ) + ) ) ); } From e09981de6f30fbf85415fe8b5cc55dc55aaad48f Mon Sep 17 00:00:00 2001 From: channa-patil Date: Sun, 15 Sep 2024 19:43:12 +0100 Subject: [PATCH 09/10] PRL-5936 - Don't close WA task upon manual urgent hwf processing event --- .../resources/wa-task-cancellation-privatelaw-prlapps.dmn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn index fcb4b11f..ec473979 100644 --- a/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-cancellation-privatelaw-prlapps.dmn @@ -348,7 +348,7 @@ - "hwfProcessCaseUpdate","processUrgentHelpWithFees" + "hwfProcessCaseUpdate" @@ -371,7 +371,7 @@ - "processHwfUpdateAwpStatus","processUrgentHelpWithFees" + "processHwfUpdateAwpStatus" From 9813508a314718ae2872e8c7ae0e670db6b1177b Mon Sep 17 00:00:00 2001 From: alokDatta Date: Mon, 16 Sep 2024 10:01:54 +0100 Subject: [PATCH 10/10] Fix for courtnav uploaded documents --- .../wa-task-initiation-privatelaw-prlapps.dmn | 2 +- .../dmn/CamundaTaskCancellationTest.java | 15 --------------- .../dmn/CamundaTaskInitiationTest.java | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn index 3ae26d60..9bb03d60 100644 --- a/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn +++ b/src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn @@ -8518,7 +8518,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then "COURTNAV" - "TRUE" + "True" diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java index 88b2b3da..96fdbdcd 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskCancellationTest.java @@ -169,21 +169,6 @@ static Stream scenarioProvider() { "processCategories", "checkAwpHwfCitizen" ) ) - ), - Arguments.of( - null, - "processUrgentHelpWithFees", - null, - List.of( - Map.of( - "action", "Cancel", - "processCategories", "applicationHwfCheck" - ), - Map.of( - "action", "Cancel", - "processCategories", "checkAwpHwfCitizen" - ) - ) ) ); } diff --git a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java index d5cd3c32..d7f29fe3 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskInitiationTest.java @@ -1177,7 +1177,7 @@ static Stream scenarioProvider() { mapAdditionalData("{\n" + " \"Data\":{\n" + " \"manageDocumentsTriggeredBy\":\"" + "COURTNAV" + "\"\n," - + " \"manageDocumentsRestrictedFlag\":\"" + "TRUE" + "\"\n" + + " \"manageDocumentsRestrictedFlag\":\"" + "True" + "\"\n" + " }" + "}"), singletonList(