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.

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

DTSPB-4361: 'Exec not accounted for' journeys #2335

Open
wants to merge 85 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
273da12
DTSPB-4411: Update probate journey to contain new executor check will…
jamiealbertelli Nov 15, 2024
0d75959
DTSPB-4411: Add new preliminary files for new Exec check will page
jamiealbertelli Nov 15, 2024
058a6db
DTSPB-4411: Complete FE text and bullets
jamiealbertelli Nov 19, 2024
d86a363
Merge branch 'master' into DTSPB-4411-back-button-spike
jamiealbertelli Nov 19, 2024
11bd321
DTSPB-4411: 'Save and Continue -> Continue' button change
jamiealbertelli Nov 19, 2024
da457b8
DTSPB-4411: Fix test to expect new page
jamiealbertelli Nov 19, 2024
b1c1a24
DTSPB-4411: Adjust probate journey according to new multi exec changes
jamiealbertelli Nov 21, 2024
919cf16
DTSPB-4411: Conditionally render question content depending on number…
jamiealbertelli Nov 21, 2024
490d6dc
DTSPB-4411: Update new content
jamiealbertelli Nov 21, 2024
cbd8449
DTSPB-4411: Rename URL and add nextStepOptions multi exec logic
jamiealbertelli Nov 21, 2024
4f6a640
DTSPB-4411: Update schema for radio buttons
jamiealbertelli Nov 21, 2024
ac34357
DTSPB-4411: Add preliminary html for updated executor named page
jamiealbertelli Nov 21, 2024
d291291
DTSPB-4411: Add preliminary html add exec name page
jamiealbertelli Nov 21, 2024
0f65a5b
DTSPB-4411: Update summary page to reflect changed URL and to continu…
jamiealbertelli Nov 21, 2024
6315ecf
Merge branch 'master' into DTSPB-4411-back-button-spike
jamiealbertelli Nov 21, 2024
b5bc19a
DTSPB-4411: Fix journey order to allow back button to work correctly
jamiealbertelli Nov 21, 2024
1f0076f
DTSPB-4411: Determine next step depending on answer and journey type
jamiealbertelli Nov 25, 2024
f582bb9
DTSPB-4411: Change schema to pass through a named exec
jamiealbertelli Nov 25, 2024
b2dd572
DTSPB-4411: Add some preliminary code to display multiple execs
jamiealbertelli Nov 25, 2024
c66d456
DTSPB-4411: Change schema to pass through a named exec
jamiealbertelli Nov 25, 2024
ac5abab
DTSPB-4411: Merge
jamiealbertelli Nov 25, 2024
6943b78
Merge branch 'master' into DTSPB-4361-exec-not-accounted-for-journeys
jamiealbertelli Dec 12, 2024
110f8eb
Merge branch 'master' into DTSPB-4361-exec-not-accounted-for-journeys
IswaryaPepakayala Dec 13, 2024
93b5de1
DTSPB-4361 Added Executors to the list and some content changes
IswaryaPepakayala Dec 16, 2024
16b9922
DTSPB-4361 Content changes
IswaryaPepakayala Dec 16, 2024
820090c
DTSPB-4361: Delete dealingwithestate pages as the functionality is be…
jamiealbertelli Dec 18, 2024
b5d13ba
DTSPB-4361: Delete dealingwithestate page
jamiealbertelli Dec 18, 2024
bdbf813
DTSPB-4361: Adjust journey now dealingwithestate and applying pages l…
jamiealbertelli Dec 18, 2024
216d727
DTSPB-4361: Add preliminary content for new /applying page
jamiealbertelli Dec 18, 2024
3cd907c
DTSPB-4361: Modify schema so checkboxes can function
jamiealbertelli Dec 18, 2024
2002ca9
DTSPB-4361: Modify template to radio or checkbox is conditionally dis…
jamiealbertelli Dec 18, 2024
3c78e26
DTSPB-4361: Update index with dealingwithestate checkbox logic whilst…
jamiealbertelli Dec 18, 2024
d4c4cd0
DTSPB-4361: Merge
jamiealbertelli Dec 18, 2024
a8b181b
DTSPB-4361 Content changes and loop changes for pages after alias page
IswaryaPepakayala Dec 19, 2024
89dbd34
DTSPB-4361 Welsh content changes and loop/error changes for executor …
IswaryaPepakayala Dec 20, 2024
7d18173
DTSPB-4361 Remove link changes
IswaryaPepakayala Dec 24, 2024
cfd45cb
DTSPB-4361 Dynamic text in error message changes
IswaryaPepakayala Jan 3, 2025
27c7830
DTSPB-4361: Add dynamic title
jamiealbertelli Jan 3, 2025
52a8a15
DTSPB-4361: Update Welsh
jamiealbertelli Jan 3, 2025
8a4df46
DTSPB-4361: Add dynamic title
jamiealbertelli Jan 3, 2025
7a38ace
DTSPB-4361: Fix formatting
jamiealbertelli Jan 6, 2025
3781925
DTSPB-4361 Fix unit test
IswaryaPepakayala Jan 6, 2025
57a57f1
DTSPB-4361: Prune data so forms are not already populated
jamiealbertelli Jan 6, 2025
f2ab8b2
DTSPB-4361: Bring correct commit in
jamiealbertelli Jan 6, 2025
7a40d6a
DTSPB-4361: Add dynamic error display functionality depending on will…
jamiealbertelli Jan 6, 2025
cda8e5a
Merge branch 'master' into DTSPB-4361-exec-not-accounted-for-journeys
MarcusHMCTS Jan 8, 2025
1d36910
Merge remote-tracking branch 'origin/DTSPB-4361-exec-not-accounted-fo…
MarcusHMCTS Jan 8, 2025
35e5d4b
DTSPB-4477: Rename test file to match journey change
jamiealbertelli Jan 9, 2025
30b8ea7
DTSPB-4477: Prelim test updates
jamiealbertelli Jan 9, 2025
631ff67
DTSPB-4361: Adjust tests to match new functionality and removed no lo…
jamiealbertelli Jan 9, 2025
4ab57c0
DTSPB-4361 Fixed Component tests still 2 are pending
IswaryaPepakayala Jan 9, 2025
56ce61f
DTSPB-4361 Fixed test
IswaryaPepakayala Jan 9, 2025
3f6b75d
DTSPB-4361 Point Preview
IswaryaPepakayala Jan 9, 2025
78cd133
Bumping chart version/ fixing aliases
hmcts-jenkins-j-to-z[bot] Jan 9, 2025
8263695
DTSPB-4361 Fix test
IswaryaPepakayala Jan 9, 2025
15ac357
DTSPB-4361 Fix Accessibility test
IswaryaPepakayala Jan 9, 2025
8e76c4e
DTSPB-4361: Add styling to header
jamiealbertelli Jan 9, 2025
9ea0fbe
DTSPB-4361: Add Welsh translation for error message
jamiealbertelli Jan 9, 2025
b95d683
DTSPB-4361 Added csrf token
IswaryaPepakayala Jan 10, 2025
520d2a8
Revert "DTSPB-4361 Added csrf token"
IswaryaPepakayala Jan 10, 2025
0171b1b
DTSPB-4361 Added csrf token
IswaryaPepakayala Jan 10, 2025
4a3bdf4
DTSPB-4361 Added csrf token
IswaryaPepakayala Jan 10, 2025
8440d0a
DTSPB-4361 Removed the delete
IswaryaPepakayala Jan 10, 2025
5125599
Revert "DTSPB-4361 Removed the delete"
IswaryaPepakayala Jan 13, 2025
dcd3ffe
DTSPB-4361: Use correct heading class
jamiealbertelli Jan 13, 2025
10eff74
DTSPB-4361 Removed the delete of field
IswaryaPepakayala Jan 13, 2025
ce538ca
DTSPB-4361 Fixed the failed component test
IswaryaPepakayala Jan 14, 2025
c394b2b
DTSPB-4361 Executor named changes
IswaryaPepakayala Jan 15, 2025
8cadd8f
DTSPB-4361 Alias page changes for looping issue1
IswaryaPepakayala Jan 17, 2025
34bdd07
DTSPB-4361 Fixed the looping issue in Alias name page and fied the tests
IswaryaPepakayala Jan 17, 2025
a47f1c4
DTSPB-4361 Fixed back loop for contact details to be on alias screen
IswaryaPepakayala Jan 17, 2025
abd7f1f
DTSPB-4361 Fixed the summary page and related tests
IswaryaPepakayala Jan 20, 2025
73b50a5
DTSPB-4361 Added tests to add coverage
IswaryaPepakayala Jan 20, 2025
41fd574
Merge branch 'master' into DTSPB-4361-exec-not-accounted-for-journeys
IswaryaPepakayala Jan 20, 2025
aebeddc
DTSPB-4361 Changed the isComplete so back link works as expected
IswaryaPepakayala Jan 20, 2025
74c0dd6
DTSPB-4361 Fixed failing test
IswaryaPepakayala Jan 20, 2025
81dbfd7
DTSPB-4361 Fixed back link check
IswaryaPepakayala Jan 22, 2025
642b299
DTSPB-4361 Removed isComplete as they can proceed wth no executor is …
IswaryaPepakayala Jan 22, 2025
ba881a2
DTSPB-4361 Remove visibility
IswaryaPepakayala Jan 22, 2025
ba77980
DTSPB-4361 Code checks
IswaryaPepakayala Jan 22, 2025
3b8f7af
DTSPB-4361 end call
IswaryaPepakayala Jan 22, 2025
ec8aa5b
DTSPB-4361 condition code check
IswaryaPepakayala Jan 22, 2025
64770cf
DTSPB-4361 condition code check
IswaryaPepakayala Jan 22, 2025
c5ca6f0
DTSPB-4361 Added test
IswaryaPepakayala Jan 22, 2025
889346b
DTSPB-4361 Added test
IswaryaPepakayala Jan 22, 2025
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
3 changes: 2 additions & 1 deletion app/resources/cy/translation/executors/named.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

"errors": {
"executorsNamed": {
"required": "Nodwch nifer yr ysgutorion"
"required": "Dewiswch ‘oes’ os oes mwy o ysgutorion wedi’u henwi yn yr ewyllys",
"requiredCodicils": "NOT CORRECT WELSH - NEED CODICILS Dewiswch ‘oes’ os oes mwy o ysgutorion wedi’u henwi yn yr ewyllys"
jamiealbertelli marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
3 changes: 2 additions & 1 deletion app/resources/en/translation/executors/named.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

"errors": {
"executorsNamed": {
"required": "Select yes if there are more executors named in the will and any codicils"
"required": "Select yes if there are more executors named in the will",
"requiredCodicils": "Select yes if there are more executors named in the will and any codicils"
}
}
}
5 changes: 2 additions & 3 deletions app/steps/ui/executors/named/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}) %}

{% set summaryListRows = [] %}
<pre>{{ fields.list.value | dump }}</pre>
{% for executor in fields.list.value %}
{% if loop.index0 == 0 %}
{% set summaryListRows = (summaryListRows.push({
Expand Down Expand Up @@ -67,8 +66,8 @@ <h2>{{ content.question | safe }}</h2>
classes: "govuk-body"
}
},
errorMessage: { text: fields.executorsNamed.errorMessage | safe } if fields.executorsNamed.errorMessage,
items: [{
errorMessage: { text: (content.error2) if fields.codicilPresent.value === "true" else content.error1 | safe } if fields.allalive.errorMessage,
items: [{
value: "optionYes",
text: content["optionYes"] | safe,
checked: true if fields.executorsNamed.value == "optionYes"
Expand Down