Merge pull request #40 from kajambiya/dev

OHRI-1648 fix lab order sub form in covid case assessment form
UCSF-IGHS · Jul 20, 2023 · 1d8e0c8 · 1d8e0c8
2 parents 328f815 + 89bfada
commit 1d8e0c8
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 78 deletions.
diff --git a/distro/configuration/ampathforms/covid_case_assessment_v1.0.json b/distro/configuration/ampathforms/covid_case_assessment_v1.0.json
@@ -1970,6 +1970,65 @@
               ]
             }
           ]
+        },
+        {
+          "label": "Lab Order Details",
+          "isExpanded": "true",
+          "questions": [
+            {
+            "label": "Add Covid Lab Order?",
+            "type": "obs",
+            "questionOptions": {
+              "rendering": "toggle",
+              "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0",
+              "toggleOptions": {
+                "labelTrue": "Yes",
+                "labelFalse": "No"
+              },
+              "conceptMappings": [
+                {
+                  "type": "OCT",
+                  "value": "LabOrdered"
+                }
+              ],
+              "answers": [
+                {
+                  "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3",
+                  "label": "Yes",
+                  "conceptMappings": [
+                    {
+                      "type": "CIEL",
+                      "value": "1065"
+                    },
+                    {
+                      "type": "AMPATH",
+                      "value": "1065"
+                    },
+                    {
+                      "type": "PIH",
+                      "value": "1065"
+                    },
+                    {
+                      "type": "SNOMED CT",
+                      "value": "CT: 373066001"
+                    }
+                  ]
+                },
+                {
+                  "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594",
+                  "label": "No",
+                  "conceptMappings": []
+                }
+              ]
+            },
+            "id": "labOrderToggle",
+            "behaviours": [
+              {
+                "intent": "*",
+                "required": "false"
+              }
+            ]
+          }]
         }
       ]
     },
@@ -1992,7 +2051,15 @@
             "readonly": "true"
           }
         ]
-      }
+      },
+      "behaviours": [
+        {
+          "intent": "*",
+                      "hide": {
+            "hideWhenExpression": "labOrderToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+          }
+        }
+      ]
     }
   ],
   "availableIntents": [

diff --git a/distro/configuration/ampathforms/covid_lab_order_v1.0.json b/distro/configuration/ampathforms/covid_lab_order_v1.0.json
@@ -11,77 +11,6 @@
           "label": "Lab Order Details",
           "isExpanded": "true",
           "questions": [
-            {
-              "label": "Order Labs",
-              "type": "obs",
-              "questionOptions": {
-                "rendering": "toggle",
-                "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0",
-                "toggleOptions": {
-                  "labelTrue": "Yes",
-                  "labelFalse": "No"
-                },
-                "conceptMappings": [
-                  {
-                    "type": "OCT",
-                    "value": "LabOrdered"
-                  }
-                ],
-                "answers": [
-                  {
-                    "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3",
-                    "label": "Yes",
-                    "conceptMappings": [
-                      {
-                        "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "PIH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373066001"
-                      }
-                    ]
-                  },
-                  {
-                    "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594",
-                    "label": "No",
-                    "conceptMappings": []
-                  }
-                ]
-              },
-              "id": "orderLabs",
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "required": "false",
-                  "hide": {
-                    "hideWhenExpression": "true"
-                  }
-                },
-                {
-                  "intent": "COVID_LAB_ORDER_EMBED",
-                  "required": "false",
-                  "hide": {
-                    "hideWhenExpression": "false"
-                  }
-                },
-                {
-                  "intent": "COVID_LAB_ORDER_RESULT_EMBED",
-                  "required": "false",
-                  "hide": {
-                    "hideWhenExpression": "true"
-                  }
-                }
-              ]
-            },
             {
               "label": "Order date",
               "type": "obs",
@@ -116,7 +45,7 @@
                   "intent": "COVID_LAB_ORDER_EMBED",
                   "required": "false",
                   "hide": {
-                    "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                    "hideWhenExpression": "false"
                   }
                 }
               ]
@@ -211,7 +140,7 @@
                   "intent": "COVID_LAB_ORDER_EMBED",
                   "required": "false",
                   "hide": {
-                    "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                    "hideWhenExpression": "false"
                   }
                 }
               ]
@@ -264,7 +193,7 @@
                   "intent": "COVID_LAB_ORDER_EMBED",
                   "required": "false",
                   "hide": {
-                    "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                    "hideWhenExpression": "false"
                   }
                 }
               ]
@@ -391,7 +320,7 @@
                   "intent": "COVID_LAB_ORDER_EMBED",
                   "required": "false",
                   "hide": {
-                    "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                    "hideWhenExpression": "false"
                   }
                 }
               ]
@@ -436,7 +365,7 @@
                   "intent": "COVID_LAB_ORDER_EMBED",
                   "required": "false",
                   "hide": {
-                    "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                    "hideWhenExpression": "false"
                   }
                 }
               ]
@@ -512,7 +441,7 @@
                 {
                   "intent": "COVID_LAB_ORDER_EMBED",
                   "hide": {
-                    "hideWhenExpression": "orderLabs == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                    "hideWhenExpression": "false"
                   }
                 }
               ]