From 3a4127a731369f71f1360000c8e5f91650ec50d7 Mon Sep 17 00:00:00 2001 From: Ramesh Pydi Date: Wed, 25 Mar 2026 12:08:48 +0000 Subject: [PATCH 1/2] FPVTL-2330: c21 c43 blank orders label in check answers --- .../uk/gov/hmcts/reform/prl/services/ManageOrderService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java b/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java index 77eb12080b3..80b41620062 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java @@ -3296,7 +3296,8 @@ public HearingData getHearingData(String authorization, private void addC21OrderDetails(CaseData caseData, Map caseDataUpdated) { caseDataUpdated.put("selectedC21Order", (null != caseData.getManageOrders() - && caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.createAnOrder) + && (caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.createAnOrder + || caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.uploadAnOrder)) ? BOLD_BEGIN + caseData.getCreateSelectOrderOptions().getDisplayedValue() + BOLD_END : " "); C21OrderOptionsEnum c21OrderType = (null != caseData.getManageOrders()) From 2d8edc2c1e3e471e96ff66a9b5b4020c4407d9a4 Mon Sep 17 00:00:00 2001 From: dharmendra kumar Date: Thu, 26 Mar 2026 14:32:37 +0000 Subject: [PATCH 2/2] Correct the display name --- .../prl/services/ManageOrderService.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java b/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java index 80b41620062..5b5c6e6f995 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java @@ -3291,14 +3291,10 @@ public HearingData getHearingData(String authorization, return hearingDataService.generateHearingData(hearingDataPrePopulatedDynamicLists, caseData); } - - private void addC21OrderDetails(CaseData caseData, Map caseDataUpdated) { - caseDataUpdated.put("selectedC21Order", (null != caseData.getManageOrders() - && (caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.createAnOrder - || caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.uploadAnOrder)) - ? BOLD_BEGIN + caseData.getCreateSelectOrderOptions().getDisplayedValue() + BOLD_END : " "); + + caseDataUpdated.put("selectedC21Order", getSelectedC21OrderDisplayName(caseData)); C21OrderOptionsEnum c21OrderType = (null != caseData.getManageOrders()) ? caseData.getManageOrders().getC21OrderOptions() : null; @@ -3306,6 +3302,20 @@ private void addC21OrderDetails(CaseData caseData, caseDataUpdated.put("typeOfC21Order", c21OrderType != null ? BOLD_BEGIN + c21OrderType.getDisplayedValue() + BOLD_END : ""); } + private String getSelectedC21OrderDisplayName(CaseData caseData) { + String emptyString = ""; + if (null == caseData.getManageOrders()) { + return emptyString; + } + if (caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.createAnOrder) { + return BOLD_BEGIN + caseData.getCreateSelectOrderOptions().getDisplayedValue() + BOLD_END; + } + if (caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.uploadAnOrder) { + return BOLD_BEGIN + caseData.getChildArrangementOrders().getDisplayedValue() + BOLD_END; + } + return emptyString; + } + private void updateCourtName(CallbackRequest callbackRequest, Map caseDataUpdated) { if (callbackRequest.getCaseDetailsBefore() != null