From a82135f7e3bd2223e09777d431e898fc2e36452d Mon Sep 17 00:00:00 2001
From: maimoonak <maimoonak.mk@gmail.com>
Date: Fri, 7 Apr 2023 14:59:00 +0500
Subject: [PATCH] Update the title on dependency answer change

---
 catalog/build.gradle.kts                      |    1 -
 catalog/src/main/AndroidManifest.xml          |    1 -
 .../assets/behavior_answer_expression.json    |  603 --------
 .../behavior_dynamic_question_title.json      |   68 +
 .../src/main/assets/resource_data_bundle.json | 1325 -----------------
 .../fhir/catalog/BehaviorListViewModel.kt     |    5 +
 .../fhir/catalog/CatalogApplication.kt        |   62 -
 .../drawable/ic_dynamic_title_behavior.xml    |   30 +
 catalog/src/main/res/values/strings.xml       |    5 +-
 .../fhir/datacapture/fhirpath/FhirPathUtil.kt |    8 +
 .../views/QuestionnaireViewItem.kt            |    3 +-
 11 files changed, 115 insertions(+), 1996 deletions(-)
 delete mode 100644 catalog/src/main/assets/behavior_answer_expression.json
 create mode 100644 catalog/src/main/assets/behavior_dynamic_question_title.json
 delete mode 100644 catalog/src/main/assets/resource_data_bundle.json
 delete mode 100644 catalog/src/main/java/com/google/android/fhir/catalog/CatalogApplication.kt
 create mode 100644 catalog/src/main/res/drawable/ic_dynamic_title_behavior.xml

diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
index 44750df319..d103159702 100644
--- a/catalog/build.gradle.kts
+++ b/catalog/build.gradle.kts
@@ -61,7 +61,6 @@ dependencies {
   implementation(Dependencies.Navigation.navUiKtx)
 
   implementation(project(path = ":datacapture"))
-  implementation(project(path = ":engine"))
   implementation(project(path = ":contrib:barcode"))
 
   testImplementation(Dependencies.junit)
diff --git a/catalog/src/main/AndroidManifest.xml b/catalog/src/main/AndroidManifest.xml
index a59865acee..81c03488a7 100644
--- a/catalog/src/main/AndroidManifest.xml
+++ b/catalog/src/main/AndroidManifest.xml
@@ -28,7 +28,6 @@
     />
 
     <application
-        android:name=".CatalogApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_card_file_box"
         android:label="@string/app_name"
diff --git a/catalog/src/main/assets/behavior_answer_expression.json b/catalog/src/main/assets/behavior_answer_expression.json
deleted file mode 100644
index 0d2cd28d74..0000000000
--- a/catalog/src/main/assets/behavior_answer_expression.json
+++ /dev/null
@@ -1,603 +0,0 @@
-{
-  "title": "eCBIS Child Immunization",
-  "description": "eCBIS Child Immunization",
-  "resourceType": "Questionnaire",
-  "status": "active",
-  "publisher": "ONA",
-  "useContext": [
-    {
-      "code": {
-        "system": "http://hl7.org/fhir/ValueSet/usage-context-type",
-        "code": "focus",
-        "display": "Clinical Focus"
-      },
-      "valueCodeableConcept": {
-        "coding": [
-          {
-            "system": "urn:oid:2.16.578.1.12.4.1.1.8655",
-            "display": "eCBIS Child Immunization"
-          }
-        ]
-      }
-    }
-  ],
-  "contact": [
-    {
-      "name": "https://www.smartregister.org"
-    }
-  ],
-  "subjectType": [
-    "Patient"
-  ],
-  "id": "9b1aa23b-577c-4fb2-84e3-591e6facaf82",
-  "version": "0.0.1",
-  "date": "2022-10-12T00:00:00Z",
-  "item": [
-    {
-      "text": "Choose a Task?",
-      "type": "reference",
-      "linkId": "1",
-      "required": true,
-      "repeats": true,
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-answerExpression",
-          "valueExpression": {
-            "expression": "Task?subject=Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1&code=33879002&status=ready&_sort=period",
-            "language": "application/x-fhir-query"
-          }
-        },
-        {
-          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-choiceColumn",
-          "extension": [
-            {
-              "url": "path",
-              "valueString": "reasonCode.text + ' - ' + reasonCode.coding.where(system='http://snomed.info/sct').display"
-            },
-            {
-              "url": "label",
-              "valueString": "description"
-            },
-            {
-              "url": "forDisplay",
-              "valueBoolean": true
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "linkId": "2",
-      "text": "Add separate date for each vaccine?",
-      "type": "boolean",
-      "required": true
-    },
-    {
-      "linkId": "3",
-      "text": "When were vaccinations done?",
-      "type": "date",
-      "required": true,
-      "enableWhen": [
-        {
-          "question": "2",
-          "operator": "=",
-          "answerBoolean": false
-        }
-      ]
-    },
-    {
-      "linkId": "4",
-      "text": "Select vaccine dates",
-      "type": "group",
-      "enableWhen": [
-        {
-          "question": "2",
-          "operator": "=",
-          "answerBoolean": true
-        }
-      ],
-      "item": [
-        {
-          "linkId": "bcg",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "opv 0",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "opv 1",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "opv 2",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "opv 3",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "penta 1",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "penta 2",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "penta 3",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "pcv 1",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "pcv 2",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "pcv 3",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "rota 1",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "rota 2",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "ipv",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "measles 1",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "measles 2",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "typhoid",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "yellow fever",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "hpv 1",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        },
-        {
-          "linkId": "hpv 2",
-          "required": true,
-          "_text": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
-                "valueExpression": {
-                  "language": "text/fhirpath",
-                  "expression": "'Select '+ %context.linkId.upper() + ' Vaccination Date'"
-                }
-              }
-            ]
-          },
-          "type": "date",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression",
-              "valueExpression": {
-                "expression": "%resource.descendants().where(linkId='1').answer.value.where(display.lower().contains(%context.linkId)).exists()",
-                "language": "text/fhirpath"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/catalog/src/main/assets/behavior_dynamic_question_title.json b/catalog/src/main/assets/behavior_dynamic_question_title.json
new file mode 100644
index 0000000000..a24fb3a936
--- /dev/null
+++ b/catalog/src/main/assets/behavior_dynamic_question_title.json
@@ -0,0 +1,68 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "text": "Choose vaccination administered",
+      "type": "choice",
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+          "valueCodeableConcept": {
+            "coding": [
+              {
+                "system": "http://hl7.org/fhir/questionnaire-item-control",
+                "code": "radio-button",
+                "display": "Radio Button"
+              }
+            ]
+          }
+        }
+      ],
+      "linkId": "1",
+      "required": true,
+      "answerOption": [
+        {
+          "valueCoding": {
+            "code": "bcg",
+            "display": "BCG - Bacillus Calmette Guerin Vaccine"
+          }
+        },
+        {
+          "valueCoding": {
+            "code": "opv 0",
+            "display": "OPV 0 - Oral Poliovirus Vaccine"
+          }
+        },
+        {
+          "valueCoding": {
+            "code": "penta 1",
+            "display": "Penta 1 - Pentavalent (DPT + Hep B + Hib) Vaccine"
+          }
+        },
+        {
+          "valueCoding": {
+            "code": "pcv 1",
+            "display": "PCV 1 - Pneumococcal Conjugate Vaccine"
+          }
+        }
+      ]
+    },
+    {
+      "linkId": "2",
+      "required": true,
+      "text": "Vaccine Date",
+      "_text": {
+        "extension": [
+          {
+            "url": "http://hl7.org/fhir/StructureDefinition/cqf-expression",
+            "valueExpression": {
+              "language": "text/fhirpath",
+              "expression": "'Select '+ %resource.descendants().where(linkId = '1').answer.value.display + ' Date'"
+            }
+          }
+        ]
+      },
+      "type": "date"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/catalog/src/main/assets/resource_data_bundle.json b/catalog/src/main/assets/resource_data_bundle.json
deleted file mode 100644
index e743280bdc..0000000000
--- a/catalog/src/main/assets/resource_data_bundle.json
+++ /dev/null
@@ -1,1325 +0,0 @@
-{
-  "resourceType": "Bundle",
-  "entry": [
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "b8e13d21-1a62-4172-a9ef-57670e6ac238",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "ef7044ac-7803-4023-a7a1-afa6882e0a9d"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "0_d"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "BCG at 0 d vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-10-01T00:00:00+05:00",
-          "end": "2026-09-30T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "42284007",
-              "display": "BCG vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "bcg",
-              "display": "BCG"
-            }
-          ],
-          "text": "BCG"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "4090ba9a-fbbb-4634-a06d-0cbe938ab090",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "b36d784d-8442-49ab-9f53-3f7a9987163a"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "0_d"
-        },
-        "status": "cancelled",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "OPV 0 at 0 d vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-10-01T00:00:00+05:00",
-          "end": "2021-10-15T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "111164008",
-              "display": "Poliovirus vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "opv0",
-              "display": "OPV 0"
-            }
-          ],
-          "text": "OPV 0"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "087e82c6-e346-4725-8db1-7e10aec99be9",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "22a068cb-e24b-4b2e-9025-d6b992f63df2"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "6_wk"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "OPV 1 at 6 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-11-12T00:00:00+05:00",
-          "end": "2026-11-11T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "111164008",
-              "display": "Poliovirus vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "opv1",
-              "display": "OPV 1"
-            }
-          ],
-          "text": "OPV 1"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "a7fe47ea-2654-4c44-9794-0ab397e850d3",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "a544594c-bf52-4212-93a9-040b17af777c"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "10_wk"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "OPV 2 at 10 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-12-10T00:00:00+05:00",
-          "end": "2026-12-09T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "111164008",
-              "display": "Poliovirus vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "opv2",
-              "display": "OPV 2"
-            }
-          ],
-          "text": "OPV 2"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "95e8600b-a96a-4411-acf0-11565c29dfca",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "d798ebaa-0eae-424e-b9be-816204896291"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "14_wk"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "OPV 3 at 14 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2022-01-07T00:00:00+05:00",
-          "end": "2027-01-06T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "111164008",
-              "display": "Poliovirus vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "opv3",
-              "display": "OPV 3"
-            }
-          ],
-          "text": "OPV 3"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "eb1fc56b-0a5b-4323-b252-e30522d37b11",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "e6a164b7-ad6b-473b-8278-6cee2265d58e"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "6_wk"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "PENTA 1 at 6 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-11-12T00:00:00+05:00",
-          "end": "2025-11-11T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "429511000124109",
-              "display": "Tetanus + diphtheria + acellular pertussis vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "penta1",
-              "display": "PENTA 1"
-            }
-          ],
-          "text": "PENTA 1"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "e98e1970-2fa7-4af7-9ea0-cb83fdddbe2e",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "6e778b02-0822-41c3-891f-ad4e2fad1173"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "10_wk"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "PENTA 2 at 10 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-12-10T00:00:00+05:00",
-          "end": "2025-12-09T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "429511000124109",
-              "display": "Tetanus + diphtheria + acellular pertussis vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "penta2",
-              "display": "PENTA 2"
-            }
-          ],
-          "text": "PENTA 2"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "14caa4d1-b9d0-4517-b441-aec3667f7488",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "d16e565f-c33e-405b-af80-60a8445937b8"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "14_wk"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "PENTA 3 at 14 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2022-01-07T00:00:00+05:00",
-          "end": "2026-01-06T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:24+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "429511000124109",
-              "display": "Tetanus + diphtheria + acellular pertussis vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "penta3",
-              "display": "PENTA 3"
-            }
-          ],
-          "text": "PENTA 3"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "6731b853-5e65-4ea3-a30e-2632a7ecf9a3",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "abf3ff4a-7bfb-4ca6-a5c6-50d3ac714f8f"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "6_wk"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "ROTA 1 at 6 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-11-12T00:00:00+05:00",
-          "end": "2022-02-25T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "415354003",
-              "display": "Rotavirus vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "rota1",
-              "display": "ROTA 1"
-            }
-          ],
-          "text": "ROTA 1"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "2ddd55ab-675a-496c-ae77-a01cce731a57",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "8627852c-9816-4d34-bb23-142a010a98f7"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "10_wk"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "ROTA 2 at 10 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-12-10T00:00:00+05:00",
-          "end": "2022-03-25T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "415354003",
-              "display": "Rotavirus vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "rota2",
-              "display": "ROTA 2"
-            }
-          ],
-          "text": "ROTA 2"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "7a862af5-99ac-480f-9a9d-aaf524051f1b",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "ed971fde-faf9-457a-9365-9d8fc5d5590e"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "6_wk"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "PCV 1 at 6 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-11-12T00:00:00+05:00",
-          "end": "2026-11-11T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "12866006",
-              "display": "Pneumococcal vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "pcv1",
-              "display": "PCV 1"
-            }
-          ],
-          "text": "PCV 1"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "d943d71f-287f-41f2-9bcb-b7a5cad93f76",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "18a4f91d-cffc-4a24-9360-3325a2d0df84"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "10_wk"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "PCV 2 at 10 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2021-12-10T00:00:00+05:00",
-          "end": "2026-12-09T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "12866006",
-              "display": "Pneumococcal vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "pcv2",
-              "display": "PCV 2"
-            }
-          ],
-          "text": "PCV 2"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "e0077490-dcfe-471f-891a-d16e17acd9f9",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "37733d72-c8fb-4afb-8f24-663c6b5007e3"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "14_wk"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "PCV 3 at 14 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2022-01-07T00:00:00+05:00",
-          "end": "2027-01-06T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "12866006",
-              "display": "Pneumococcal vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "pcv3",
-              "display": "PCV 3"
-            }
-          ],
-          "text": "PCV 3"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "9cf8b37e-5075-4afd-a3eb-096c6836c1a0",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "cf053ee9-e861-4375-8ab0-a1301cc285a2"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "14_wk"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "IPV at 14 wk vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2022-01-07T00:00:00+05:00",
-          "end": "2027-01-06T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "396435000",
-              "display": "Inactivated Poliovirus vaccine"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "ipv",
-              "display": "IPV"
-            }
-          ],
-          "text": "IPV"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "533e96fb-f20d-4f08-917a-6497d0b41cf5",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "e9355146-2735-4101-9def-2509f9d1ff3a"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "9_mo"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "MEASLES 1 at 9 mo vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2022-07-01T00:00:00+05:00",
-          "end": "2027-06-30T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "38598009",
-              "display": "Measles-mumps-rubella vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "measles1",
-              "display": "MEASLES 1"
-            }
-          ],
-          "text": "MEASLES 1"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "d2336046-157d-4ddb-bb68-83af0c21012d",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "23fad5b2-b9a5-4338-92c8-58eb4b905cd6"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "15_mo"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "MEASLES 2 at 15 mo vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2023-01-01T00:00:00+05:00",
-          "end": "2027-12-31T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "38598009",
-              "display": "Measles-mumps-rubella vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "measles2",
-              "display": "MEASLES 2"
-            }
-          ],
-          "text": "MEASLES 2"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "d33b0286-6abc-4cf9-8377-20f5a6372b19",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "710e1e73-eb4c-41b4-9f3a-d15c6d55651d"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "9_mo"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "YELLOW FEVER at 9 mo vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2022-07-01T00:00:00+05:00",
-          "end": "2027-06-30T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "67308009",
-              "display": "Yellow fever vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "yellow fever",
-              "display": "YELLOW FEVER"
-            }
-          ],
-          "text": "YELLOW FEVER"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "6ad3198f-1585-4ae0-b36b-b043630ab792",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "5e166b0b-815d-4c52-ba0e-f55fcfb165a0"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "9_mo"
-        },
-        "status": "ready",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "TYPHOID at 9 mo vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2022-07-01T00:00:00+05:00",
-          "end": "2024-06-30T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "15483003",
-              "display": "Typhoid vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "typhoid",
-              "display": "TYPHOID"
-            }
-          ],
-          "text": "TYPHOID"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "e9168702-4ce5-4169-b671-22d45c9daa3e",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "ffe062e7-d378-4ac5-893a-2dc2428b2acb"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "3285_d"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "HPV 1 at 3285 d vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2030-09-29T00:00:00+05:00",
-          "end": "2040-09-29T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "761841000",
-              "display": "Human papillomavirus vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "hpv1",
-              "display": "HPV 1"
-            }
-          ],
-          "text": "HPV 1"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    },
-    {
-      "resource": {
-        "resourceType": "Task",
-        "id": "eac02ce5-0382-42ab-8edb-fbba6212e932",
-        "identifier": [
-          {
-            "use": "official",
-            "value": "69b24830-99ea-4f4d-90bb-e8cbac4dc84e"
-          }
-        ],
-        "basedOn": [
-          {
-            "reference": "CarePlan/7b31a89b-d85a-4a43-9cbf-6cd13729bada"
-          }
-        ],
-        "groupIdentifier": {
-          "use": "secondary",
-          "value": "3467_d"
-        },
-        "status": "requested",
-        "intent": "plan",
-        "priority": "routine",
-        "code": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "33879002",
-              "display": "Administration of vaccine to produce active immunity (procedure)"
-            }
-          ]
-        },
-        "description": "HPV 2 at 3467 d vaccine",
-        "for": {
-          "reference": "Patient/3e3d698a-4edb-48f9-9330-2f1adc0635d1"
-        },
-        "executionPeriod": {
-          "start": "2031-03-30T00:00:00+05:00",
-          "end": "2042-03-29T00:00:00+05:00"
-        },
-        "authoredOn": "2023-04-06T14:50:25+05:00",
-        "requester": {
-          "reference": "Practitioner/3812"
-        },
-        "owner": {
-          "reference": "Practitioner/3812"
-        },
-        "reasonCode": {
-          "coding": [
-            {
-              "system": "http://snomed.info/sct",
-              "code": "761841000",
-              "display": "Human papillomavirus vaccination"
-            },
-            {
-              "system": "https://smartregister.org/immunization/vaccine-codes",
-              "code": "hpv2",
-              "display": "HPV 2"
-            }
-          ],
-          "text": "HPV 2"
-        },
-        "reasonReference": {
-          "reference": "Questionnaire/9b1aa23b-577c-4fb2-84e3-591e6facaf82"
-        }
-      }
-    }
-  ]
-}
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/BehaviorListViewModel.kt b/catalog/src/main/java/com/google/android/fhir/catalog/BehaviorListViewModel.kt
index 934b5505dc..4f77cde644 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/BehaviorListViewModel.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/BehaviorListViewModel.kt
@@ -47,6 +47,11 @@ class BehaviorListViewModel(application: Application) : AndroidViewModel(applica
       R.drawable.ic_skiplogic_behavior,
       R.string.behavior_name_skip_logic,
       "behavior_skip_logic.json"
+    ),
+    DYNAMIC_QUESTION_TITLE(
+    R.drawable.ic_dynamic_title_behavior,
+    R.string.behavior_name_dynamic_question_title,
+    "behavior_dynamic_question_title.json"
     )
   }
 }
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/CatalogApplication.kt b/catalog/src/main/java/com/google/android/fhir/catalog/CatalogApplication.kt
deleted file mode 100644
index 3efe52e60c..0000000000
--- a/catalog/src/main/java/com/google/android/fhir/catalog/CatalogApplication.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.catalog
-
-import android.app.Application
-import ca.uhn.fhir.context.FhirContext
-import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.FhirEngineConfiguration
-import com.google.android.fhir.FhirEngineProvider
-import com.google.android.fhir.datacapture.DataCaptureConfig
-import com.google.android.fhir.search.search
-import com.google.android.fhir.sync.SyncJobStatus
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.hl7.fhir.r4.model.Bundle
-
-class CatalogApplication : Application(), DataCaptureConfig.Provider {
-  // Only initiate the FhirEngine when used for the first time, not when the app is created.
-  private val fhirEngine: FhirEngine by lazy { FhirEngineProvider.getInstance(this) }
-
-  private lateinit var dataCaptureConfig: DataCaptureConfig
-
-  override fun onCreate() {
-    super.onCreate()
-
-    FhirEngineProvider.init(FhirEngineConfiguration(testMode = true))
-
-    dataCaptureConfig = DataCaptureConfig(xFhirQueryResolver = { fhirEngine.search(it) })
-
-    this.assets.open("resource_data_bundle.json").bufferedReader().use { it.readText() }.let {
-      FhirContext.forR4Cached().newJsonParser().parseResource(it) as Bundle
-    }.entry.map {
-      it.resource
-    }.also { resources ->
-      CoroutineScope(Dispatchers.IO).launch {
-        fhirEngine.create(*resources.toTypedArray())
-      }
-    }
-  }
-
-  override fun getDataCaptureConfig(): DataCaptureConfig = dataCaptureConfig
-}
diff --git a/catalog/src/main/res/drawable/ic_dynamic_title_behavior.xml b/catalog/src/main/res/drawable/ic_dynamic_title_behavior.xml
new file mode 100644
index 0000000000..e47e63e483
--- /dev/null
+++ b/catalog/src/main/res/drawable/ic_dynamic_title_behavior.xml
@@ -0,0 +1,30 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="194dp"
+    android:height="128dp"
+    android:viewportWidth="194"
+    android:viewportHeight="128"
+>
+  <path
+        android:strokeWidth="1"
+        android:pathData="M135.5,27V101C135.5,101.828 134.828,102.5 134,102.5H60C59.172,102.5 58.5,101.828 58.5,101V27C58.5,26.172 59.172,25.5 60,25.5H97H134C134.828,25.5 135.5,26.172 135.5,27Z"
+        android:fillColor="#ffffff"
+        android:strokeColor="#8AB4F8"
+    />
+  <path
+        android:pathData="M64,49C64,43.477 68.477,39 74,39L135,39V59L74,59C68.477,59 64,54.523 64,49V49Z"
+        android:fillColor="#D2E3FC"
+    />
+  <path
+        android:pathData="M74,49m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+        android:fillColor="#1A73E8"
+    />
+  <path
+        android:pathData="M125,79C125,84.523 120.523,89 115,89L59,89L59,69L115,69C120.523,69 125,73.477 125,79V79Z"
+        android:fillColor="#D2E3FC"
+    />
+  <path
+        android:pathData="M115,79m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+        android:fillColor="#1A73E8"
+    />
+</vector>
diff --git a/catalog/src/main/res/values/strings.xml b/catalog/src/main/res/values/strings.xml
index fbd6b75847..b275b55ee5 100644
--- a/catalog/src/main/res/values/strings.xml
+++ b/catalog/src/main/res/values/strings.xml
@@ -43,9 +43,8 @@
     <string
         name="behavior_name_skip_logic_info"
     >If Yes is selected, a follow-up question is displayed. If No is selected, no follow-up questions are displayed.</string>
-    <string
-        name="behavior_name_enable_when_expression"
-    >Enable When Expression</string>
+    <string name="behavior_name_enable_when_expression">Enable When Expression</string>
+    <string name="behavior_name_dynamic_question_title">Dynamic Question Title</string>
     <string
         name="behavior_name_calculated_expression_info"
     >Input age to automatically calculate birthdate until birthdate is updated manually.</string>
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtil.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtil.kt
index 1c14d1da17..5e09997894 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtil.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtil.kt
@@ -37,6 +37,14 @@ internal val fhirPathEngine: FHIRPathEngine =
 internal fun evaluateToDisplay(expressions: List<String>, data: Resource) =
   expressions.joinToString(" ") { fhirPathEngine.evaluateToString(data, it) }
 
+/** Evaluates the expressions over list of resources [QuestionnaireResponse] and [QuestionnaireResponseItemComponent] and returns the resulting elements
+ * FhirPath supplements https://build.fhir.org/ig/HL7/sdc/expressions.html#fhirpath-supplements
+ * %resource = [QuestionnaireResponse]
+ * %context = [QuestionnaireResponseItemComponent]
+ **/
+internal fun evaluateToBase(questionnaireResponse: QuestionnaireResponse, questionnaireResponseItemComponent: QuestionnaireResponseItemComponent, expression: String) =
+  fhirPathEngine.evaluate(null, questionnaireResponse, null, questionnaireResponseItemComponent, expression)
+
 /**
  * Evaluates the expressions over list of resources [QuestionnaireResponse] and
  * [QuestionnaireResponseItemComponent] and returns the resulting elements FhirPath supplements
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
index 3b7429694a..37b02a8583 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
@@ -230,7 +230,8 @@ data class QuestionnaireViewItem(
    */
   internal fun hasTheSameItem(other: QuestionnaireViewItem) =
     questionnaireItem === other.questionnaireItem &&
-      questionnaireResponseItem === other.questionnaireResponseItem
+      questionnaireResponseItem === other.questionnaireResponseItem &&
+            questionTitle === other.questionTitle
 
   /**
    * Returns whether this [QuestionnaireViewItem] and the `other` [QuestionnaireViewItem] have the