From 80fd3ccd2bbe3340a7e9405d05a4c97c998a3961 Mon Sep 17 00:00:00 2001
From: AJAL ODORA JONATHAN <43242517+ODORA0@users.noreply.github.com>
Date: Tue, 13 Aug 2024 17:20:04 +0300
Subject: [PATCH] Refactors to Date fields

---
 .../configuration/ampathforms/pmtct_antenatal_v1.0.json   | 7 +------
 .../ampathforms/pmtct_infant_postnatal_v1.0.json          | 8 +-------
 .../ampathforms/pmtct_labour_and_delivery_v1.0.json       | 7 +------
 .../ampathforms/pmtct_mother_postnatal_v1.0.json          | 5 +----
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
index 29917466b..65ce65740 100644
--- a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
@@ -16,6 +16,7 @@
               "label": "Visit Date",
               "type": "obs",
               "id": "visit_date",
+              "required": true,
               "questionOptions": {
                 "concept": "163260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "date"
@@ -23,7 +24,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "false"
                   },
@@ -182,7 +182,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "antenatal_visit_type !== '164180AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -215,7 +214,6 @@
                 {
                   "intent": "*",
                   "required": "true",
-                  "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "antenatal_visit_type !== '164180AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty('lmp')"
                   },
@@ -644,7 +642,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "!isEmpty(latest_art_start_date) ? true : isEmpty(latest_art_number) && latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? false : isEmpty(art_initiation) || art_initiation == '160018AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || art_initiation == '1754AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || art_initiation =='54b96458-6585-4c4c-a5b1-b3ca7f1be351' ||  hiv_test == 'd18fa331-f158-47d0-b344-cf147c7125a4' || hiv_test == '54b96458-6585-4c4c-a5b1-b3ca7f1be351' || hiv_test_result == '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || hiv_test_result == '1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || hiv_test_result == '54b96458-6585-4c4c-a5b1-b3ca7f1be351'"
@@ -735,7 +732,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "recent_viral_load !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ||  hiv_test == 'd18fa331-f158-47d0-b344-cf147c7125a4' || hiv_test == '54b96458-6585-4c4c-a5b1-b3ca7f1be351' || hiv_test_result == '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || hiv_test_result == '1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || hiv_test_result == '54b96458-6585-4c4c-a5b1-b3ca7f1be351'"
@@ -1115,7 +1111,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "false"
diff --git a/distro/configuration/ampathforms/pmtct_infant_postnatal_v1.0.json b/distro/configuration/ampathforms/pmtct_infant_postnatal_v1.0.json
index 01e12bbb4..b65f0762b 100644
--- a/distro/configuration/ampathforms/pmtct_infant_postnatal_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_infant_postnatal_v1.0.json
@@ -16,6 +16,7 @@
               "label": "Visit Date",
               "type": "obs",
               "id": "visit_date",
+              "required": true,
               "questionOptions": {
                 "concept": "159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "date"
@@ -23,7 +24,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "false"
                   },
@@ -680,7 +680,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "infant_transfer_status !== '160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -735,7 +734,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "infant_transfer_status !== '159492AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -764,7 +762,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "infant_transfer_status !== '5240AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -793,7 +790,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "infant_transfer_status !== '164861AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -823,7 +819,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "infant_transfer_status !== '160432AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -855,7 +850,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "infant_transfer_status !== '161636AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
diff --git a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
index ffeb41496..f69bb8c7e 100644
--- a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
@@ -16,6 +16,7 @@
               "label": "Visit Date",
               "type": "obs",
               "id": "visit_date",
+              "required": true,
               "questionOptions": {
                 "concept": "163260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "date"
@@ -23,7 +24,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "false"
                   },
@@ -773,7 +773,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "!isEmpty(latest_art_start_date) ? true : isEmpty(latest_art_start_date) && latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? false : art_initiation !== '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && art_initiation !== '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || anc_hiv_test_status !== '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' && anc_hiv_test_status !== '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && anc_hiv_test_status !== '1402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && anc_hiv_test_status !== '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || hiv_test_status !== '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -883,7 +882,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "recent_viral_load !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -1047,7 +1045,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "mother_status !== '1692AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -1152,7 +1149,6 @@
                   "behaviours": [
                     {
                       "intent": "*",
-                      "required": "true",
                       "unspecified": "true",
                       "hide": {
                         "hideWhenExpression": "false"
@@ -1346,7 +1342,6 @@
                   "behaviours": [
                     {
                       "intent": "*",
-                      "required": "true",
                       "unspecified": "true",
                       "hide": {
                         "hideWhenExpression": "infantStatus !== '154223AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
diff --git a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
index 050986706..8c6341844 100644
--- a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
@@ -16,6 +16,7 @@
               "label": "Visit Date",
               "type": "obs",
               "id": "visit_date",
+              "required": true,
               "questionOptions": {
                 "concept": "163260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "date"
@@ -516,7 +517,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "!isEmpty(latest_art_start_date) ? true : isEmpty(latest_art_start_date) && latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? false : pnc_art_initiation !== '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && pnc_art_initiation !== '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -599,7 +599,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "!includes('pnc_recent_viral_load','1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
@@ -694,7 +693,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "false"
@@ -787,7 +785,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
                   "hide": {
                     "hideWhenExpression": "pnc_transfer_out !== '160036AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"