diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json index 17e0035cb3..638b386b59 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json @@ -352,6 +352,30 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "orderAfterHearingDate", + "AccessControl": [ + { + "UserRoles": [ + "judge-profile" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "showOrderAfterHearingDatePage", + "AccessControl": [ + { + "UserRoles": [ + "judge-profile" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "confirmListingTickBox", diff --git a/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json new file mode 100644 index 0000000000..e597ded19c --- /dev/null +++ b/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json @@ -0,0 +1,43 @@ +[ + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "dateType", + "FieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "EventElementLabel": "Enter date(s) of hearing" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "date", + "FieldDisplayOrder": 2, + "DisplayContext": "MANDATORY" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "fromDate", + "FieldDisplayOrder": 3, + "DisplayContext": "MANDATORY" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "toDate", + "FieldDisplayOrder": 4, + "DisplayContext": "MANDATORY" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "bespokeDates", + "FieldDisplayOrder": 5, + "DisplayContext": "MANDATORY" + } +] diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json index 8f12638430..6291ddb7dd 100644 --- a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json +++ b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json @@ -35,6 +35,17 @@ "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", "ShowSummaryChangeOption": "N" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "showOrderAfterHearingDatePage", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "TrackAllocation", + "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", + "ShowSummaryChangeOption": "N" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", @@ -706,12 +717,25 @@ "ShowSummaryChangeOption": "Y", "PageShowCondition": "finalOrderTrackToggle= \"SMALL_CLAIM\" OR finalOrderTrackToggle= \"FAST_CLAIM\"" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "PageLabel": "Order Made", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 1, + "DisplayContext": "COMPLEX", + "PageID": "OrderAfterHearingDate", + "ShowSummaryChangeOption": "Y", + "PageShowCondition": "showOrderAfterHearingDatePage=\"Yes\"", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/hearing-date-order" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "downloadTemplateLabel1", "PageLabel": "Download template", - "PageDisplayOrder": 5, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", "PageID": "DownloadTemplate", @@ -722,7 +746,7 @@ "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "finalOrderDownloadTemplateDocument", - "PageDisplayOrder": 5, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "DownloadTemplate", @@ -733,7 +757,7 @@ "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "downloadTemplateLabel2", "PageLabel": "Download template", - "PageDisplayOrder": 5, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 3, "DisplayContext": "READONLY", "PageID": "DownloadTemplate", @@ -744,7 +768,7 @@ "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "uploadOrderDocumentFromTemplateLabel", "PageLabel": "Upload order", - "PageDisplayOrder": 6, + "PageDisplayOrder": 7, "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", "PageID": "UploadOrder", @@ -755,7 +779,7 @@ "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "uploadOrderDocumentFromTemplate", - "PageDisplayOrder": 6, + "PageDisplayOrder": 7, "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "UploadOrder", diff --git a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json index 49fdb56c22..28bef148c9 100644 --- a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json +++ b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json @@ -209,5 +209,21 @@ "FieldType": "TaskManagementLocationTab", "SecurityClassification": "Public", "Searchable": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "orderAfterHearingDate", + "Label": " ", + "FieldType": "OrderAfterHearingDate", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "showOrderAfterHearingDatePage", + "Label": " ", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/ComplexTypes/DQ/1_OrderAfterHearing_HearingDate-MINTI-nonprod.json b/ccd-definition/ComplexTypes/DQ/1_OrderAfterHearing_HearingDate-MINTI-nonprod.json new file mode 100644 index 0000000000..7e0f154ae3 --- /dev/null +++ b/ccd-definition/ComplexTypes/DQ/1_OrderAfterHearing_HearingDate-MINTI-nonprod.json @@ -0,0 +1,53 @@ +[ + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "dateType", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "OrderAfterHearingDateType", + "ElementLabel": "Enter date(s) of hearing", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "date", + "FieldType": "Date", + "ElementLabel": "Date", + "SecurityClassification": "Public", + "HintText": "For example 16 4 2021", + "FieldShowCondition": "dateType = \"SINGLE_DATE\"", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "fromDate", + "FieldType": "Date", + "ElementLabel": "Date from", + "SecurityClassification": "Public", + "HintText": "For example 16 4 2021", + "FieldShowCondition": "dateType = \"DATE_RANGE\"", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "toDate", + "FieldType": "Date", + "ElementLabel": "Date to", + "SecurityClassification": "Public", + "FieldShowCondition": "dateType = \"DATE_RANGE\"", + "HintText": "For example 16 4 2021", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "bespokeDates", + "FieldType": "TextArea", + "ElementLabel": "Enter a bespoke range of dates for hearing", + "HintText": "For example, 16 4 2021, 19-20 4 2021 and 11-12 5 2021", + "SecurityClassification": "Public", + "FieldShowCondition": "dateType = \"BESPOKE_RANGE\"", + "Searchable": "N" + } +] + + diff --git a/ccd-definition/FixedLists/OrderAfterHearingDateTypes-MINTI-nonprod.json b/ccd-definition/FixedLists/OrderAfterHearingDateTypes-MINTI-nonprod.json new file mode 100644 index 0000000000..10870a2c7c --- /dev/null +++ b/ccd-definition/FixedLists/OrderAfterHearingDateTypes-MINTI-nonprod.json @@ -0,0 +1,20 @@ +[ + { + "ID": "OrderAfterHearingDateType", + "ListElementCode": "SINGLE_DATE", + "ListElement": "Single date", + "DisplayOrder": 1 + }, + { + "ID": "OrderAfterHearingDateType", + "ListElementCode": "DATE_RANGE", + "ListElement": "Date range", + "DisplayOrder": 2 + }, + { + "ID": "OrderAfterHearingDateType", + "ListElementCode": "BESPOKE_RANGE", + "ListElement": "Bespoke range", + "DisplayOrder": 3 + } +] diff --git a/e2e/fixtures/events/finalOrder.js b/e2e/fixtures/events/finalOrder.js index 5b567469ab..0959286587 100644 --- a/e2e/fixtures/events/finalOrder.js +++ b/e2e/fixtures/events/finalOrder.js @@ -99,7 +99,8 @@ const createIntermediateDownloadOrder = () => { TrackAllocation: { finalOrderTrackToggle: 'INTERMEDIATE_CLAIM', finalOrderAllocateToTrack: 'Yes', - finalOrderTrackAllocation: 'INTERMEDIATE_CLAIM' + finalOrderTrackAllocation: 'INTERMEDIATE_CLAIM', + showOrderAfterHearingDatePage: 'No' }, IntermediateTrackComplexityBand: { finalOrderIntermediateTrackComplexityBand: { @@ -133,7 +134,8 @@ const createMultiDownloadOrder = () => { TrackAllocation: { finalOrderTrackToggle: 'MULTI_CLAIM', finalOrderAllocateToTrack: 'Yes', - finalOrderTrackAllocation: 'MULTI_CLAIM' + finalOrderTrackAllocation: 'MULTI_CLAIM', + showOrderAfterHearingDatePage: 'No' }, SelectTemplate: { finalOrderDownloadTemplateOptions: { diff --git a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js index 52c44481c2..009074b96d 100644 --- a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js @@ -11,7 +11,7 @@ const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let civilCaseReference; -Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle @non-prod-e2e-ft'); +Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle'); Scenario('1v2 Same Solicitor Int Track - Download order template - Upload Bundle', async ({api, I}) => { const mpScenario = 'ONE_V_TWO_ONE_LEGAL_REP';