Skip to content

Commit 32c8128

Browse files
authored
Merge pull request #3979 from opencrvs/ocrvs-3977
ocrvs-3977 Fixed multipleBirth of mother field value on declaration
2 parents eb3c571 + ad9463d commit 32c8128

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

packages/client/src/tests/default.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,6 +1353,7 @@
13531353
"id": "form.field.label.iDTypeNationalID"
13541354
},
13551355
"required": false,
1356+
"customisable": true,
13561357
"initialValue": "",
13571358
"validate": [
13581359
{
@@ -1407,6 +1408,7 @@
14071408
"id": "form.field.label.motherDateOfBirth"
14081409
},
14091410
"required": true,
1411+
"customisable": true,
14101412
"initialValue": "",
14111413
"validate": [
14121414
{
@@ -1639,6 +1641,7 @@
16391641
},
16401642
"validate": [],
16411643
"initialValue": "",
1644+
"customisable": true,
16421645
"required": true
16431646
},
16441647
{
@@ -1688,6 +1691,7 @@
16881691
"id": "form.field.label.iDTypeNationalID"
16891692
},
16901693
"required": false,
1694+
"customisable": true,
16911695
"initialValue": "",
16921696
"validate": [
16931697
{
@@ -1998,7 +2002,7 @@
19982002
"expression": "!values.detailsExist && !mothersDetailsExistBasedOnContactAndInformant"
19992003
}
20002004
],
2001-
"customisable": false,
2005+
"customisable": true,
20022006
"required": false,
20032007
"initialValue": "",
20042008
"validate": [
@@ -2041,6 +2045,7 @@
20412045
"id": "form.field.label.motherEducationAttainment"
20422046
},
20432047
"required": false,
2048+
"customisable": true,
20442049
"initialValue": "",
20452050
"validate": [],
20462051
"conditionals": [
@@ -2183,6 +2188,7 @@
21832188
"description": "Label for form field: reasonFatherNotApplying",
21842189
"id": "form.field.label.reasonFatherNotApplying"
21852190
},
2191+
"customisable": true,
21862192
"validate": [],
21872193
"initialValue": "",
21882194
"required": true
@@ -2234,6 +2240,7 @@
22342240
"id": "form.field.label.iDTypeNationalID"
22352241
},
22362242
"required": false,
2243+
"customisable": true,
22372244
"initialValue": "",
22382245
"validate": [
22392246
{
@@ -3802,6 +3809,7 @@
38023809
"id": "form.field.label.iDTypeNationalID"
38033810
},
38043811
"required": false,
3812+
"customisable": true,
38053813
"initialValue": "",
38063814
"validate": [
38073815
{
@@ -4029,6 +4037,7 @@
40294037
"id": "form.field.label.maritalStatus"
40304038
},
40314039
"required": false,
4040+
"customisable": true,
40324041
"initialValue": "",
40334042
"validate": [],
40344043
"placeholder": {
@@ -4250,7 +4259,8 @@
42504259
"description": "Label for form field: Cause of Death Established",
42514260
"id": "form.field.label.causeOfDeathEstablished"
42524261
},
4253-
"required": false,
4262+
"required": true,
4263+
"customisable": true,
42544264
"initialValue": "true",
42554265
"size": "normal",
42564266
"validate": [],
@@ -4296,6 +4306,7 @@
42964306
"id": "form.field.label.causeOfDeathMethod"
42974307
},
42984308
"required": true,
4309+
"customisable": true,
42994310
"initialValue": "",
43004311
"validate": [],
43014312
"placeholder": {
@@ -4375,6 +4386,7 @@
43754386
"initialValue": "",
43764387
"validate": [],
43774388
"required": true,
4389+
"customisable": true,
43784390
"maxLength": 500,
43794391
"mapping": {
43804392
"mutation": {
@@ -4564,6 +4576,7 @@
45644576
"id": "form.field.label.iDTypeNationalID"
45654577
},
45664578
"required": false,
4579+
"customisable": true,
45674580
"initialValue": "",
45684581
"validate": [
45694582
{

packages/client/src/views/DataProvider/birth/queries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export const GET_BIRTH_REGISTRATION_FOR_REVIEW = gql`
1919
id
2020
child {
2121
id
22-
multipleBirth
2322
name {
2423
use
2524
firstNames
@@ -65,6 +64,7 @@ export const GET_BIRTH_REGISTRATION_FOR_REVIEW = gql`
6564
firstNames
6665
familyName
6766
}
67+
multipleBirth
6868
birthDate
6969
maritalStatus
7070
occupation

packages/client/src/views/RegisterForm/PreviewForm.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ describe('when user is previewing the form data', () => {
325325

326326
beforeEach(async () => {
327327
getItem.mockReturnValue(registerScopeToken)
328-
await store.dispatch(checkAuth())
328+
store.dispatch(checkAuth())
329329
await flushPromises()
330330
const data = deathReviewDraftData
331331

0 commit comments

Comments
 (0)