Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CIV-14300 And CIV-14210 Bug Fixes #5127

Merged
merged 19 commits into from
Jul 31, 2024
Merged

CIV-14300 And CIV-14210 Bug Fixes #5127

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c89f6e5
CIV-14300 and CIV-13642 bug fixes
kannan-v-hmcts Jul 18, 2024
c969875
CIV-14210 fixing tests
kannan-v-hmcts Jul 18, 2024
39cdbfc
Merge branch 'master' into feat/CIV-14300
kannan-v-hmcts Jul 19, 2024
048db96
Merge branch 'master' into feat/CIV-14300
kannan-v-hmcts Jul 24, 2024
21224b2
Merge branch 'master' into feat/CIV-14300
dharmendrak Jul 25, 2024
716e093
CIV-14300 bug fix
kannan-v-hmcts Jul 25, 2024
d8f848f
CIV-14300 & 14166 Trial arrangements task list doesn't update to done…
kannan-v-hmcts Jul 26, 2024
5566bdc
Merge branch 'master' into feat/CIV-14300
kannan-v-hmcts Jul 26, 2024
62dc21a
CIV-14300 & 14166 fixing test issues
kannan-v-hmcts Jul 26, 2024
4134555
CIV-14300 & 14166 fixing test
kannan-v-hmcts Jul 26, 2024
3fb9717
Merge branch 'master' into feat/CIV-14300
kannan-v-hmcts Jul 26, 2024
03deb99
CIV-14300 & 14166 fixing test
kannan-v-hmcts Jul 26, 2024
5005868
CIV-14300 & 14166 fixing test
kannan-v-hmcts Jul 26, 2024
84f80eb
CIV-14300 & 14166 removing unnecessary scenario
kannan-v-hmcts Jul 26, 2024
7f529b7
Merge branch 'master' into feat/CIV-14300
kannan-v-hmcts Jul 26, 2024
a6be092
CIV-14300 & 14166 renaming scenario
kannan-v-hmcts Jul 29, 2024
49e7b51
Merge branch 'master' into feat/CIV-14300
kannan-v-hmcts Jul 29, 2024
74cea06
Merge branch 'master' into feat/CIV-14300
dharmendrak Jul 30, 2024
388a90e
Merge branch 'master' into feat/CIV-14300
kannan-v-hmcts Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .../civil/controllers/dashboard/scenarios/claimant/EvidenceUploadedClaimantScenarioTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ void should_enable_view_documents_task_list_when_claimant_uploads_document_scena
jsonPath("$[0].categoryEn").value("Hearing"),
jsonPath("$[0].role").value("CLAIMANT"),
jsonPath("$[0].taskOrder").value("11"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
jsonPath("$[0].currentStatusCy").value("Ar gael"),
jsonPath("$[0].categoryCy").value("Hearing")
jsonPath("$[0].categoryCy").value("Gwrandawiad")
);
}

Expand Down Expand Up @@ -88,9 +88,9 @@ void should_enable_view_documents_task_list_when_defendant_uploads_document_scen
jsonPath("$[0].categoryEn").value("Hearing"),
jsonPath("$[0].role").value("CLAIMANT"),
jsonPath("$[0].taskOrder").value("11"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
jsonPath("$[0].currentStatusCy").value("Ar gael"),
jsonPath("$[0].categoryCy").value("Hearing")
jsonPath("$[0].categoryCy").value("Gwrandawiad")
);
}

Expand Down
8 changes: 4 additions & 4 deletions ...ivil/controllers/dashboard/scenarios/defendant/EvidenceUploadedDefendantScenarioTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ void should_enable_view_documents_task_list_when_defendant_uploads_document_scen
jsonPath("$[0].categoryEn").value("Hearing"),
jsonPath("$[0].role").value("DEFENDANT"),
jsonPath("$[0].taskOrder").value("11"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
jsonPath("$[0].currentStatusCy").value("Ar gael"),
jsonPath("$[0].categoryCy").value("Hearing")
jsonPath("$[0].categoryCy").value("Gwrandawiad")
);
}

Expand Down Expand Up @@ -88,9 +88,9 @@ void should_enable_view_documents_task_list_when_claimant_uploads_document_scena
jsonPath("$[0].categoryEn").value("Hearing"),
jsonPath("$[0].role").value("DEFENDANT"),
jsonPath("$[0].taskOrder").value("11"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">View documents</a>"),
jsonPath("$[0].taskNameCy").value("<a href=\"{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}\" class=\"govuk-link\">Gweld y dogfennau</a>"),
jsonPath("$[0].currentStatusCy").value("Ar gael"),
jsonPath("$[0].categoryCy").value("Hearing")
jsonPath("$[0].categoryCy").value("Gwrandawiad")
);
}

Expand Down
4 changes: 2 additions & 2 deletions ...n/V2024_04_02_1500__CIV-11302_trial_arrangements_notify_other_party_claimant_scenario.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
VALUES ('Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant',
'{"Notice.AAA6.CP.Trial.Arrangements.Required.BothParties"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Required.Defendant"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant" : []}');

/**
Expand All @@ -20,4 +20,4 @@ VALUES ('Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant',
INSERT INTO dbs.task_item_template (task_name_en, category_en, task_name_cy, category_cy, template_name,
scenario_name, task_status_sequence, role, task_order)
values ('<a>Add the trial arrangements</a>', 'Hearing' ,'<a>Ychwanegu trefniadau''r treial</a>',
'Gwrandawiad', 'Hearing.Arrangements.Add', 'Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant', '{7, 7}', 'DEFENDANT', 12);
'Gwrandawiad', 'Hearing.Arrangements.Add', 'Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant', '{7, 7}', 'DEFENDANT', 11);
2 changes: 1 addition & 1 deletion .../V2024_04_04_1500__CIV-13259_trial_arrangements_notify_other_party_defendant_scenario.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
VALUES ('Scenario.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant',
'{"Notice.AAA6.CP.Trial.Arrangements.Required.BothParties"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Required.Claimant"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant" : []}');

/**
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/db/migration/V2024_04_04_1632__CIV-11303_bundle_created_scenario.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
*/
INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
VALUES ('Scenario.AAA6.CP.Bundle.Ready.Claimant',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant", "Notice.AAA6.CP.Trial.Arrangements.Required.Claimant"}',
'{"Notice.AAA6.CP.Bundle.Ready.Claimant" : []}'),
('Scenario.AAA6.CP.Bundle.Ready.Defendant',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant", "Notice.AAA6.CP.Trial.Arrangements.Required.Defendant"}',
'{"Notice.AAA6.CP.Bundle.Ready.Defendant" : []}'),
('Scenario.AAA6.CP.Bundle.Ready.TrialReady.Claimant',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Defendant", "Notice.AAA6.CP.Trial.Arrangements.Required.Claimant"}',
'{"Notice.AAA6.CP.Bundle.Ready.Claimant" : []}'),
('Scenario.AAA6.CP.Bundle.Ready.TrialReady.Defendant',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant"}',
'{"Notice.AAA6.CP.Trial.Arrangements.Finalised.NotifyOtherParty.Claimant", "Notice.AAA6.CP.Trial.Arrangements.Required.Defendant"}',
'{"Notice.AAA6.CP.Bundle.Ready.Defendant" : []}');

/**
Expand Down
16 changes: 8 additions & 8 deletions ...esources/db/migration/V2024_05_15_1300__CIV-11832_hearing_documents_uploaded_scenario.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ VALUES ('Scenario.AAA6.CP.HearingDocuments.Uploaded.Claimant',
*/
INSERT INTO dbs.task_item_template (task_name_en, category_en, task_name_cy, category_cy, template_name,
scenario_name, task_status_sequence, role, task_order, hint_text_en, hint_text_cy)
values ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null),
('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>',
'Hearing', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null);
values ('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Claimant','{3, 3}', 'CLAIMANT', 11, null, null),
('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.NotUploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null),
('<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">View documents</a>', 'Hearing' ,'<a href="{VIEW_EVIDENCE_UPLOAD_DOCUMENTS}" class="govuk-link">Gweld y dogfennau</a>',
'Gwrandawiad', 'Hearing.Document.View', 'Scenario.AAA6.CP.HearingDocuments.Uploaded.Defendant','{3, 3}', 'DEFENDANT', 11, null, null);
Loading