Skip to content

Commit

Permalink
Aligned the Yes/No answers and date validations (#184)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ckote
ckote authored Sep 6, 2023
1 parent 5fed95c commit 2708501
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 98 deletions.
158 changes: 86 additions & 72 deletions configuration/ampathforms/PrEP_Follow_Up.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,17 @@
"concept": "085ce2e6-071e-43be-a32c-ecaac001e44f",
"rendering": "select",
"answers": [
{
"concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Unknown"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Unknown"
}
]
},
Expand All @@ -258,7 +258,7 @@
]
},
"hide": {
"hideWhenExpression": "vmmcScreened !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'M'"
"hideWhenExpression": "vmmcStatus !== '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'M'"
}
}
]
Expand Down Expand Up @@ -320,13 +320,13 @@
"concept": "5272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
},
Expand Down Expand Up @@ -354,18 +354,18 @@
"concept": "1426AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || pregnancyStatus == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || pregnancyStatus == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
},
{
Expand All @@ -376,18 +376,18 @@
"concept": "b3b2fa9f-d4ac-42c1-8ac2-5cba19fa0403",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || pregnancyStatus == '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || pregnancyStatus == '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
},
{
Expand All @@ -398,18 +398,18 @@
"concept": "5632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
},
{
Expand All @@ -435,7 +435,7 @@
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
},
{
Expand Down Expand Up @@ -493,7 +493,7 @@
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || familyplanningStatus == '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || familyplanningStatus == '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
}
]
Expand Down Expand Up @@ -521,7 +521,7 @@
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause === '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
},
{
Expand Down Expand Up @@ -551,7 +551,7 @@
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause === '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
},
{
Expand All @@ -569,7 +569,7 @@
}
],
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause === '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
},
{
Expand All @@ -580,22 +580,22 @@
"concept": "159521AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Unknown"
}
]
},
"hide": {
"hideWhenExpression": "menoPause == '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
"hideWhenExpression": "menoPause === '134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
}
}
]
Expand Down Expand Up @@ -1652,13 +1652,13 @@
"concept": "1272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
}
Expand All @@ -1675,13 +1675,13 @@
"concept": "1788AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Patient referred to hospital?"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
}
Expand Down Expand Up @@ -1747,13 +1747,13 @@
"concept": "1272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
}
Expand All @@ -1770,13 +1770,13 @@
"concept": "1788AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Patient referred to hospital?"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
}
Expand All @@ -1789,13 +1789,13 @@
"concept": "1272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
}
Expand Down Expand Up @@ -1843,13 +1843,13 @@
"rendering": "radio",
"concept": "aba5a106-719b-46f3-9199-224f3881a738",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
},
Expand All @@ -1863,13 +1863,13 @@
"rendering": "radio",
"concept": "906ac5d0-566a-466e-93e4-2f23b4fb319b",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
},
Expand Down Expand Up @@ -1939,6 +1939,9 @@
"questionOptions": {
"rendering": "radio",
"concept": "42ad51f2-dc4f-48eb-8440-9a0bd8969374",
"calculate": {
"calculateExpression": "String(hivSigns) === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : ''"
},
"answers": [
{
"concept": "1257AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
Expand Down Expand Up @@ -2100,8 +2103,8 @@
"rendering": "text"
},
"hide": {
"hideWhenExpression": "isEmpty(treatmentPlan) || treatmentPlan === '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
}
"hideWhenExpression": "isEmpty(prepType) || prepType !== 'cb583a50-2b6c-4a6a-a458-a6a3c41fa1a7'"
}
},
{
"label": "Condoms issued",
Expand All @@ -2111,13 +2114,13 @@
"concept": "159777AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
}
Expand Down Expand Up @@ -2149,13 +2152,13 @@
"concept": "7bfe041e-e921-4798-b9fd-a8f222a56be2",
"rendering": "radio",
"answers": [
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
},
{
"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "Yes"
},
{
"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"label": "No"
}
]
}
Expand All @@ -2167,6 +2170,17 @@
"rendering": "date",
"concept": "5096AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
"validators": [
{
"type": "date",
"allowFutureDates": "true"
},
{
"type": "js_expression",
"failsWhenExpression": "(new moment(encDate)).isAfter((new moment(myValue)), 'day') || (new moment(encDate)).isSame((new moment(myValue)), 'day')",
"message": "Return to clinic date should be greater than the encounter date."
}
],
"hide": {
"hideWhenExpression": "tcaGiven !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
},
Expand Down
Loading

0 comments on commit 2708501

Please sign in to comment.