OHRI-1743 Fix COVID Lab view action issue

UCSF-IGHS · Aug 11, 2023 · 5c9bf48 · 5c9bf48
1 parent 9833881
commit 5c9bf48
Show file tree

Hide file tree

Showing 3 changed files with 195 additions and 4 deletions.
diff --git a/distro/configuration/ampathforms/covid_lab_order_cancellation_v1.0.json b/distro/configuration/ampathforms/covid_lab_order_cancellation_v1.0.json
@@ -18,7 +18,15 @@
             "readonly": "true"
           }
         ]
-      }
+      },
+      "behaviours": [
+        {
+          "intent": "COVID_LAB_CANCELLATION_EMBED",
+          "hide": {
+            "hideWhenExpression": "true"
+          }
+        }
+      ]
     },
     {
       "label": "Order Cancellation",
@@ -52,6 +60,15 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_LAB_CANCELLATION_EMBED",
+                  "required": "true",
+                  "unspecified": "true",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -150,6 +167,15 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_LAB_CANCELLATION_EMBED",
+                  "required": "true",
+                  "unspecified": "true",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -196,6 +222,15 @@
                     "hideWhenExpression": "false"
                   },
                   "value": "165170AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                },
+                {
+                  "intent": "COVID_LAB_CANCELLATION_EMBED",
+                  "required": "false",
+                  "unspecified": "false",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "value": "165170AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                 }
               ]
             }
@@ -208,6 +243,10 @@
     {
       "intent": "*",
       "display": "COVID Lab Order Cancellation"
+    },
+    {
+      "intent": "COVID_LAB_CANCELLATION_EMBED",
+      "display": "COVID Lab Cancellation Embed"
     }
   ],
   "processor": "EncounterFormProcessor",

diff --git a/distro/configuration/ampathforms/covid_lab_result_v1.0.json b/distro/configuration/ampathforms/covid_lab_result_v1.0.json
@@ -14,13 +14,21 @@
         "behaviours": [
           {
             "intent": "*",
-            "subform_intent": "COVID_LAB_ORDER_RESULT_EMBED",
+            "subform_intent": "COVID_LAB_ORDER_EMBED",
             "readonly": "true"
           }
         ]
-      }
+      },
+      "behaviours": [
+        {
+          "intent": "COVID_LAB_RESULT_EMBED",
+          "hide": {
+            "hideWhenExpression": "true"
+          }
+        }
+      ]
     },
-    {
+    { 
       "label": "Lab Result",
       "sections": [
         {
@@ -56,6 +64,11 @@
                   "intent": "*",
                   "required": "true",
                   "unspecified": "true"
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "required": "true",
+                  "unspecified": "true"
                 }
               ]
             },
@@ -254,6 +267,13 @@
                   "hide": {
                     "hideWhenExpression": "wasTheTestPerformed !== '488b58ff-64f5-4f8a-8979-fa79940b1594'"
                   }
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "required": "true",
+                  "hide": {
+                    "hideWhenExpression": "wasTheTestPerformed !== '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                  }
                 }
               ]
             },
@@ -278,6 +298,13 @@
                     "hideWhenExpression": "wasTheTestPerformed !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
                   },
                   "value": "1267AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "hide": {
+                    "hideWhenExpression": "wasTheTestPerformed !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
+                  },
+                  "value": "1267AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                 }
               ]
             },
@@ -307,6 +334,23 @@
                       "failsWhenExpression": "isDateBefore(myValue, '2020-01-01')"
                     }
                   ]
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "required": "true",
+                  "hide": {
+                    "hideWhenExpression": "wasTheTestPerformed !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
+                  },
+                  "validators": [
+                    {
+                      "type": "date",
+                      "allowFutureDates": "false"
+                    },
+                    {
+                      "type": "js_expression",
+                      "failsWhenExpression": "isDateBefore(myValue, '2020-01-01')"
+                    }
+                  ]
                 }
               ]
             },
@@ -331,6 +375,13 @@
                     "hideWhenExpression": "wasTheTestPerformed !== '488b58ff-64f5-4f8a-8979-fa79940b1594'"
                   },
                   "value": "1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "hide": {
+                    "hideWhenExpression": "wasTheTestPerformed !== '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+                  },
+                  "value": "1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                 }
               ]
             },
@@ -397,6 +448,13 @@
                   "hide": {
                     "hideWhenExpression": "testRequested !== '165852AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || wasTheTestPerformed !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
                   }
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "required": "true",
+                  "hide": {
+                    "hideWhenExpression": "testRequested !== '165852AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || wasTheTestPerformed !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
+                  }
                 }
               ]
             },
@@ -462,6 +520,13 @@
                   "hide": {
                     "hideWhenExpression": "testRequested !== '165840AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || wasTheTestPerformed !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
                   }
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "required": "true",
+                  "hide": {
+                    "hideWhenExpression": "testRequested !== '165840AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || wasTheTestPerformed !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
+                  }
                 }
               ]
             },
@@ -488,6 +553,10 @@
                 {
                   "intent": "*",
                   "required": "false"
+                },
+                {
+                  "intent": "COVID_LAB_RESULT_EMBED",
+                  "required": "false"
                 }
               ]
             }
@@ -500,6 +569,10 @@
     {
       "intent": "*",
       "display": "Lab Result"
+    },
+    {
+      "intent": "COVID_LAB_RESULT_EMBED",
+      "display": "COVID Lab Result Embed"
     }
   ],
   "processor": "EncounterFormProcessor",

diff --git a/distro/configuration/ampathforms/covid_sample_collection_v1.0.json b/distro/configuration/ampathforms/covid_sample_collection_v1.0.json
@@ -30,6 +30,14 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "required": "false",
+                  "hide": {
+                    "hideWhenExpression": "true"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -63,6 +71,16 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "required": "false",
+                  "unspecified": "true",
+                  "readonly": "true",
+                  "hide": {
+                    "hideWhenExpression": "true"
+                  },
+                  "validators": []
                 }
               ]
             }
@@ -101,6 +119,15 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "required": "true",
+                  "unspecified": "true",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -143,6 +170,15 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "required": "true",
+                  "unspecified": "true",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -172,6 +208,15 @@
                         "hideWhenExpression": "!includes('specimenType','5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
                       },
                       "validators": []
+                    },
+                    {
+                      "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                      "required": "true",
+                      "unspecified": "true",
+                      "hide": {
+                        "hideWhenExpression": "!includes('specimenType','5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+                      },
+                      "validators": []
                     }
                   ]
                 }
@@ -204,6 +249,15 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "required": "false",
+                  "unspecified": "true",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -293,6 +347,15 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "required": "true",
+                  "unspecified": "true",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -318,6 +381,13 @@
                     "hideWhenExpression": "!includes('isSpecimenSentToLab', '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "hide": {
+                    "hideWhenExpression": "!includes('isSpecimenSentToLab', '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+                  },
+                  "validators": []
                 }
               ]
             },
@@ -349,6 +419,15 @@
                     "hideWhenExpression": "false"
                   },
                   "validators": []
+                },
+                {
+                  "intent": "COVID_SAMPLE_COLLECTION_EMBED",
+                  "required": "false",
+                  "unspecified": "false",
+                  "hide": {
+                    "hideWhenExpression": "false"
+                  },
+                  "validators": []
                 }
               ]
             }