From ee8449aff3c8469e2bdc730c4a42aa446dccfe23 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Wed, 6 Sep 2023 17:05:29 +0300
Subject: [PATCH] (chore) Setup prettier

---
 .eslintrc.json                                |  25 +-
 .github/pull_request_template.md              |   6 +-
 .github/workflows/main.yml                    |  22 +-
 .prettierrc                                   |   4 +-
 README.md                                     |   7 +-
 package.json                                  |  11 +-
 projects/ngx-formentry/src/adult.json         |   2 +-
 .../ngx-pick-datetime/sass/picker.scss        | 110 +--
 .../ngx-remote-select.component.ts            |   2 +-
 .../number-input/number-input.module.ts       |   2 +-
 .../radio-button/radio.component.html         |   2 +-
 .../radio-button/radio.component.ts           |  22 +-
 .../directives/historical-value.directive.ts  |   2 +-
 .../src/form-entry/form-factory/form-node.ts  |   6 +-
 .../form-factory/form.factory.spec.ts         |   4 +-
 .../form-factory/validation.factory.ts        |   8 +-
 .../historical-expression-helper-service.ts   |   2 +-
 .../helpers/js-expression-helper.spec.ts      |  32 +-
 .../helpers/js-expression-helper.ts           |  55 +-
 .../form-entry/helpers/risk-dataset-table.ts  |  70 +-
 .../interfaces/diagnosis-question-options.ts  |   2 +-
 .../max-length-validation.model.ts            |   4 +-
 .../min-length-validation.model.ts            |   4 +-
 .../validators/max-length.validator.ts        |   2 +-
 .../validators/min-length.validator.ts        |   2 +-
 .../value-adapters/diagnosis.adapter.spec.ts  |  86 +-
 .../value-adapters/diagnosis.adapter.ts       | 136 ++-
 .../value-adapters/encounter.adapter.spec.ts  |  26 +-
 .../value-adapters/encounter.adapter.ts       |  19 +-
 .../value-adapters/obs-adapter-helper.ts      |   8 +-
 .../patient-identifier.adapter.spec.ts        | 190 ++--
 .../patient-identifier.adapter.ts             | 147 ++-
 projects/ngx-formentry/src/lib/index.ts       |   2 +-
 .../ngx-formentry/styles/ngx-formentry.css    |   2 +-
 proxy.conf.json                               |  10 +-
 src/app/adult-1.4.json                        |  10 +-
 src/app/app.component.ts                      |  25 +-
 src/app/mock/mock-translations.ts             | 123 ++-
 src/app/mock/obs.json                         |  17 +-
 src/app/ncd-registration-1.0.json             | 866 +++++++++---------
 src/app/translate/translate.module.ts         |   8 +-
 src/tsconfig.app.json                         |  17 +-
 tsconfig.json                                 |  19 +-
 yarn.lock                                     |   5 +
 44 files changed, 1117 insertions(+), 1007 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 4afdb750..73f75258 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,24 +1,17 @@
 {
   "root": true,
-  "ignorePatterns": [
-    "projects/**/*",
-    "**/*.spec.ts"
-  ],
+  "ignorePatterns": ["projects/**/*", "**/*.spec.ts"],
   "overrides": [
     {
-      "files": [
-        "*.ts"
-      ],
+      "files": ["*.ts"],
       "parserOptions": {
-        "project": [
-          "tsconfig.json",
-          "e2e/tsconfig.json"
-        ],
+        "project": ["tsconfig.json", "e2e/tsconfig.json"],
         "createDefaultProgram": true
       },
       "extends": [
         "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/template/process-inline-templates"
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "prettier"
       ],
       "rules": {
         "@angular-eslint/component-selector": [
@@ -44,12 +37,8 @@
       }
     },
     {
-      "files": [
-        "*.html"
-      ],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended"
-      ],
+      "files": ["*.html"],
+      "extends": ["plugin:@angular-eslint/template/recommended"],
       "rules": {}
     }
   ]
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a8dfecb2..159bdbe3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,18 +1,22 @@
-## Requirements
+# Requirements
 
 - [ ] This PR has a title that briefly describes the work done, including the ticket number if there is a ticket.
 - [ ] My work conforms to the [OpenMRS 3.0 Styleguide](https://om.rs/styleguide) and [design documentation](https://zeroheight.com/23a080e38/p/880723-introduction).
 - [ ] My work includes tests or is validated by existing tests.
 
 ## Summary
+
 <!-- Please describe what problems your PR addresses. -->
 
 ## Screenshots
+
 <!-- Required if you are making UI changes. -->
 
 ## Related Issue
+
 <!-- Paste the link to the Jira ticket here if one exists. -->
 <!-- https://issues.openmrs.org/browse/O3- -->
 
 ## Other
+
 <!-- Anything not covered above -->
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 20122360..73af817d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,9 +2,9 @@ name: Form Entry CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
   release:
     types:
       - created
@@ -18,8 +18,8 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
-          cache: "npm"
+          node-version: '16'
+          cache: 'npm'
       - run: yarn install --frozen-lockfile
 
       - name: Setup a local cache server for Turborepo
@@ -27,11 +27,11 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           server-token: ${{ secrets.TURBO_SERVER_TOKEN }}
-      
+
       - name: Run lint
         run: yarn turbo lint --color --concurrency=5 --api="http://127.0.0.1:9080" --token="${{ secrets.TURBO_SERVER_TOKEN }}" --team="${{ github.repository_owner }}"
 
-      - name: Run tests 
+      - name: Run tests
         run: yarn turbo test --color --concurrency=5 --api="http://127.0.0.1:9080" --token="${{ secrets.TURBO_SERVER_TOKEN }}" --team="${{ github.repository_owner }}"
 
       - name: Run build
@@ -47,11 +47,11 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
-          cache: "npm"
+          node-version: '16'
+          cache: 'npm'
       - run: yarn install --frozen-lockfile
       - run: export NEW_VERSION="$(node -e "console.log(require('semver').inc(require('./package.json').version, 'patch'))")-pre.${{ github.run_number }}" && yarn version --new-version $NEW_VERSION --no-git-tag-version && cd projects/ngx-formentry && yarn version --new-version $NEW_VERSION --no-git-tag-version
-      - run: yarn turbo build:lib --color --concurrency=5 
+      - run: yarn turbo build:lib --color --concurrency=5
       - run: git config user.email "info@openmrs.org" && git config user.name "OpenMRS CI"
       - run: git add . && git commit -m "Prerelease version" --no-verify
       - run: yarn publish dist/ngx-formentry --tag next --access public
@@ -74,8 +74,8 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
-          cache: "npm"
+          node-version: '16'
+          cache: 'npm'
       - run: yarn install --frozen-lockfile
 
       - name: Build
diff --git a/.prettierrc b/.prettierrc
index 7ca0d159..02a74cac 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,6 +1,6 @@
 {
-  "trailingComma": "none",
+  "semi": true,
   "singleQuote": true,
   "tabWidth": 2,
-  "semi": true
+  "trailingComma": "none"
 }
diff --git a/README.md b/README.md
index a3ad271a..a274b8fe 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ Which is should be fine if your are not working on custom components (Make sure
 
 `$ git clone https://github.com/AMPATH/ngx-openmrs-formentry`
 
-`$ cd ngx-openmrs-formentry `
+`$ cd ngx-openmrs-formentry`
 
 `$ yarn`
 
@@ -93,11 +93,12 @@ Which is should be fine if your are not working on custom components (Make sure
 `$ yarn run build:lib`
 
 ### Linking ngx-formentry with form-entry-app in patient chart
+
 While you have your patient chart and ngx-formentry repo open locally,
-Build the ngx-formentry project by 
+Build the ngx-formentry project by
 running `$yarn run build:lib`
 
-Then cd into the `dist/ngx-formentry`  directory created from the previous step.
+Then cd into the `dist/ngx-formentry` directory created from the previous step.
 Run `$ pwd | pbcopy` to copy that path.
 
 On the patient chart repo cd into `esm-form-entry-app`
diff --git a/package.json b/package.json
index ba04211f..b9a23035 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "test": "ng test ngx-formentry --watch=false",
     "test:watch": "ng test ngx-formentry",
     "lint": "TIMING=1 ng lint",
+    "prettier": "prettier --config .prettierrc --write \"projects/**/*.{html,js,ts,css,scss}\" \"src/**/*.{html,js,ts,css,scss}\" --ignore-unknown",
     "e2e": "ng e2e"
   },
   "peerDependencies": {
@@ -68,6 +69,7 @@
     "@typescript-eslint/parser": "^4.26.0",
     "browserslist-config-openmrs": "^1.0.1",
     "eslint": "^7.6.0",
+    "eslint-config-prettier": "^9.0.0",
     "husky": "^4.3.0",
     "jasmine-core": "^3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -77,7 +79,6 @@
     "karma-firefox-launcher": "^1.1.0",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.7.0",
-    "lint-staged": "^10.4.0",
     "ng-packagr": "^12.2.7",
     "prettier": "2.1.2",
     "protractor": "~7.0.0",
@@ -91,14 +92,8 @@
   ],
   "husky": {
     "hooks": {
-      "pre-commit": "yarn run lint",
+      "pre-commit": "yarn run prettier && yarn run lint",
       "pre-push": "yarn run test"
     }
-  },
-  "lint-staged": {
-    "*.{ts,js,css,md}": [
-      "prettier --write",
-      "yarn run lint"
-    ]
   }
 }
diff --git a/projects/ngx-formentry/src/adult.json b/projects/ngx-formentry/src/adult.json
index 36b354fa..20822d09 100644
--- a/projects/ngx-formentry/src/adult.json
+++ b/projects/ngx-formentry/src/adult.json
@@ -295,7 +295,7 @@
                     "identifierType": "dfacd928-0370-4315-99d7-6ec1c9f7ae76"
                   }
                 },
-                
+
                 {
                   "type": "obs",
                   "label": "If non-Ampath, specify:",
diff --git a/projects/ngx-formentry/src/components/ngx-pick-datetime/sass/picker.scss b/projects/ngx-formentry/src/components/ngx-pick-datetime/sass/picker.scss
index babd3d85..c6f3030b 100644
--- a/projects/ngx-formentry/src/components/ngx-pick-datetime/sass/picker.scss
+++ b/projects/ngx-formentry/src/components/ngx-pick-datetime/sass/picker.scss
@@ -12,7 +12,8 @@ $cdk-overlay-dark-backdrop-background: rgba(0, 0, 0, 0.288);
 $backdrop-animation-duration: 400ms !default;
 $backdrop-animation-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;
 
-.cdk-overlay-container, .cdk-global-overlay-wrapper {
+.cdk-overlay-container,
+.cdk-global-overlay-wrapper {
   // Disable events from being captured on the overlay container.
   pointer-events: none;
 
@@ -72,7 +73,8 @@ $backdrop-animation-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;
   z-index: $cdk-z-index-overlay-backdrop;
   pointer-events: auto;
   -webkit-tap-highlight-color: transparent;
-  transition: opacity $backdrop-animation-duration $backdrop-animation-timing-function;
+  transition: opacity $backdrop-animation-duration
+    $backdrop-animation-timing-function;
   opacity: 0;
 
   &.cdk-overlay-backdrop-showing {
@@ -97,7 +99,8 @@ $backdrop-animation-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;
   // capturing the user's mouse scroll events. Since we also can't use something like
   // `rgba(0, 0, 0, 0)`, we work around the inconsistency by not setting the background at
   // all and using `opacity` to make the element transparent.
-  &, &.cdk-overlay-backdrop-showing {
+  &,
+  &.cdk-overlay-backdrop-showing {
     opacity: 0;
   }
 }
@@ -144,12 +147,11 @@ $backdrop-animation-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;
   display: block;
   padding: 1.5em;
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2),
-  0px 24px 38px 3px rgba(0, 0, 0, 0.14),
-  0px 9px 46px 8px rgba(0, 0, 0, 0.12);
+    0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
   border-radius: 2px;
   overflow: auto;
   background: #fff;
-  color: rgba(0, 0, 0, .87);
+  color: rgba(0, 0, 0, 0.87);
   width: 100%;
   height: 100%;
   outline: none;
@@ -171,7 +173,7 @@ $theme-color: #3f51b5;
 }
 
 .owl-dt-container-row {
-  border-bottom: 1px solid rgba(0, 0, 0, .12);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 
   &:last-child {
     border-bottom: none;
@@ -189,7 +191,7 @@ $theme-color: #3f51b5;
   align-items: center;
   font-size: 1em;
   width: 100%;
-  padding: .5em;
+  padding: 0.5em;
   color: #000000;
 
   .owl-dt-calendar-control-content {
@@ -199,10 +201,10 @@ $theme-color: #3f51b5;
     align-items: center;
 
     .owl-dt-calendar-control-button {
-      padding: 0 .8em;
+      padding: 0 0.8em;
 
       &:hover {
-        background-color: rgba(0, 0, 0, .12);;
+        background-color: rgba(0, 0, 0, 0.12);
       }
     }
   }
@@ -212,7 +214,7 @@ $theme-color: #3f51b5;
   display: flex;
   flex-direction: column;
   flex: 1 1 auto;
-  padding: 0 .5em .5em;
+  padding: 0 0.5em 0.5em;
   outline: 0;
 }
 
@@ -229,7 +231,7 @@ $theme-color: #3f51b5;
     width: calc(100% - 3em);
 
     .owl-dt-calendar-header th {
-      padding-bottom: .25em;
+      padding-bottom: 0.25em;
     }
   }
 }
@@ -240,11 +242,11 @@ $theme-color: #3f51b5;
   border-spacing: 0;
 
   .owl-dt-calendar-header {
-    color: rgba(0, 0, 0, .4);
+    color: rgba(0, 0, 0, 0.4);
 
     .owl-dt-weekdays {
       th {
-        font-size: .7em;
+        font-size: 0.7em;
         font-weight: 400;
         text-align: center;
         padding-bottom: 1em;
@@ -254,16 +256,16 @@ $theme-color: #3f51b5;
     .owl-dt-calendar-table-divider {
       position: relative;
       height: 1px;
-      padding-bottom: .5em;
+      padding-bottom: 0.5em;
 
       &:after {
         content: '';
         position: absolute;
         top: 0;
-        left: -.5em;
-        right: -.5em;
+        left: -0.5em;
+        right: -0.5em;
         height: 1px;
-        background: rgba(0, 0, 0, .12);
+        background: rgba(0, 0, 0, 0.12);
       }
     }
   }
@@ -274,7 +276,7 @@ $theme-color: #3f51b5;
     line-height: 0;
     text-align: center;
     outline: 0;
-    color: rgba(0, 0, 0, .85);
+    color: rgba(0, 0, 0, 0.85);
     -webkit-appearance: none;
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     -webkit-tap-highlight-color: transparent;
@@ -290,7 +292,7 @@ $theme-color: #3f51b5;
     box-sizing: border-box;
     width: 90%;
     height: 90%;
-    font-size: .8em;
+    font-size: 0.8em;
     line-height: 1;
     border: 1px solid transparent;
     border-radius: 999px;
@@ -299,19 +301,19 @@ $theme-color: #3f51b5;
   }
 
   .owl-dt-calendar-cell-out {
-    opacity: .2;
+    opacity: 0.2;
   }
 
   .owl-dt-calendar-cell-today:not(.owl-dt-calendar-cell-selected) {
-    border-color: rgba(0, 0, 0, .4);
+    border-color: rgba(0, 0, 0, 0.4);
   }
 
   .owl-dt-calendar-cell-selected {
-    color: hsla(0, 0%, 100%, .85);
+    color: hsla(0, 0%, 100%, 0.85);
     background-color: $theme-color;
 
     &.owl-dt-calendar-cell-today {
-      box-shadow: inset 0 0 0 1px hsla(0, 0%, 100%, .85);
+      box-shadow: inset 0 0 0 1px hsla(0, 0%, 100%, 0.85);
     }
   }
 
@@ -319,25 +321,27 @@ $theme-color: #3f51b5;
     cursor: default;
 
     & > .owl-dt-calendar-cell-content:not(.owl-dt-calendar-cell-selected) {
-      color: rgba(0, 0, 0, .4);
+      color: rgba(0, 0, 0, 0.4);
     }
 
     & > .owl-dt-calendar-cell-content.owl-dt-calendar-cell-selected {
-      opacity: .4;
+      opacity: 0.4;
     }
 
     & > .owl-dt-calendar-cell-today:not(.owl-dt-calendar-cell-selected) {
-      border-color: rgba(0, 0, 0, .2);
+      border-color: rgba(0, 0, 0, 0.2);
     }
   }
 
-  .owl-dt-calendar-cell-active:focus > .owl-dt-calendar-cell-content:not(.owl-dt-calendar-cell-selected),
-  :not(.owl-dt-calendar-cell-disabled):hover > .owl-dt-calendar-cell-content:not(.owl-dt-calendar-cell-selected) {
-    background-color: rgba(0, 0, 0, .04);
+  .owl-dt-calendar-cell-active:focus
+    > .owl-dt-calendar-cell-content:not(.owl-dt-calendar-cell-selected),
+  :not(.owl-dt-calendar-cell-disabled):hover
+    > .owl-dt-calendar-cell-content:not(.owl-dt-calendar-cell-selected) {
+    background-color: rgba(0, 0, 0, 0.04);
   }
 
   .owl-dt-calendar-cell-in-range {
-    background: rgba($theme-color, .2);
+    background: rgba($theme-color, 0.2);
 
     &.owl-dt-calendar-cell-range-from {
       border-top-left-radius: 999px;
@@ -356,7 +360,7 @@ $theme-color: #3f51b5;
   justify-content: center;
   width: 100%;
   height: 7em;
-  padding: .5em;
+  padding: 0.5em;
   outline: none;
 }
 
@@ -375,17 +379,17 @@ $theme-color: #3f51b5;
   justify-content: center;
   align-items: center;
   width: 100%;
-  margin: .2em 0;
+  margin: 0.2em 0;
 
   .owl-dt-timer-input {
     display: block;
     width: 2em;
     text-align: center;
-    border: 1px solid rgba(0, 0, 0, .5);
+    border: 1px solid rgba(0, 0, 0, 0.5);
     border-radius: 3px;
     outline: medium none;
     font-size: 1.2em;
-    padding: .2em;
+    padding: 0.2em;
   }
 }
 
@@ -393,16 +397,16 @@ $theme-color: #3f51b5;
   display: inline-block;
   align-self: flex-end;
   position: absolute;
-  width: .6em;
+  width: 0.6em;
   height: 100%;
-  left: -.3em;
+  left: -0.3em;
 
   &:before,
   &:after {
     content: '';
     display: inline-block;
-    width: .35em;
-    height: .35em;
+    width: 0.35em;
+    height: 0.35em;
     position: absolute;
     left: 50%;
     border-radius: 50%;
@@ -447,13 +451,13 @@ $theme-color: #3f51b5;
 .owl-dt-control-period-button {
   .owl-dt-control-button-content {
     height: 1.5em;
-    padding: 0 .5em;
+    padding: 0 0.5em;
     border-radius: 3px;
     transition: background-color 100ms linear;
   }
 
   &:hover > .owl-dt-control-button-content {
-    background-color: rgba(0, 0, 0, .12);
+    background-color: rgba(0, 0, 0, 0.12);
   }
 
   .owl-dt-control-button-arrow {
@@ -462,7 +466,7 @@ $theme-color: #3f51b5;
     align-items: center;
     width: 1em;
     height: 1em;
-    margin: .1em;
+    margin: 0.1em;
     transition: transform 200ms ease;
   }
 }
@@ -476,7 +480,7 @@ $theme-color: #3f51b5;
   }
 
   &[disabled] {
-    color: rgba(0, 0, 0, .4);
+    color: rgba(0, 0, 0, 0.4);
     cursor: default;
   }
 
@@ -491,9 +495,8 @@ $theme-color: #3f51b5;
 .owl-dt-popup-container {
   position: relative;
   width: 18.5em;
-  box-shadow: 0 5px 5px -3px rgba(0, 0, 0, .2),
-  0 8px 10px 1px rgba(0, 0, 0, .14),
-  0 3px 14px 2px rgba(0, 0, 0, .12);
+  box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
+    0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12);
 
   .owl-dt-calendar,
   .owl-dt-timer {
@@ -569,13 +572,13 @@ $theme-color: #3f51b5;
 
   &:hover {
     .owl-dt-control-button-content {
-      background-color: rgba(0, 0, 0, .1);
+      background-color: rgba(0, 0, 0, 0.1);
     }
   }
 }
 
 .owl-dt-container-info {
-  padding: 0 .5em;
+  padding: 0 0.5em;
   cursor: pointer;
   -webkit-tap-highlight-color: transparent;
 
@@ -585,8 +588,8 @@ $theme-color: #3f51b5;
     .owl-dt-container-range-content {
       display: flex;
       justify-content: space-between;
-      padding: .5em 0;
-      font-size: .8em;
+      padding: 0.5em 0;
+      font-size: 0.8em;
     }
 
     &:last-child {
@@ -621,10 +624,11 @@ $theme-color: #3f51b5;
     .owl-dt-control-button-content {
       width: 100%;
       height: 100%;
-      padding: .5em;
+      padding: 0.5em;
     }
 
-    &:focus, &:hover {
+    &:focus,
+    &:hover {
       .owl-dt-control-button-content {
         background: $theme-color;
         color: #ffffff;
@@ -653,7 +657,7 @@ $theme-color: #3f51b5;
   }
 
   &:focus > .owl-dt-control-content {
-    background-color: rgba(0, 0, 0, .12);
+    background-color: rgba(0, 0, 0, 0.12);
   }
 
   &:not(:-moz-focusring):focus > .owl-dt-control-content {
diff --git a/projects/ngx-formentry/src/components/ngx-remote-select/ngx-remote-select.component.ts b/projects/ngx-formentry/src/components/ngx-remote-select/ngx-remote-select.component.ts
index a949efb6..a7d25829 100644
--- a/projects/ngx-formentry/src/components/ngx-remote-select/ngx-remote-select.component.ts
+++ b/projects/ngx-formentry/src/components/ngx-remote-select/ngx-remote-select.component.ts
@@ -5,7 +5,7 @@ import {
   forwardRef,
   Output,
   EventEmitter,
-  Renderer2,
+  Renderer2
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { concat, Observable, of, Subject } from 'rxjs';
diff --git a/projects/ngx-formentry/src/components/number-input/number-input.module.ts b/projects/ngx-formentry/src/components/number-input/number-input.module.ts
index fd3a6790..5964cddf 100644
--- a/projects/ngx-formentry/src/components/number-input/number-input.module.ts
+++ b/projects/ngx-formentry/src/components/number-input/number-input.module.ts
@@ -8,7 +8,7 @@ import { NumberInputDirective } from './number.directive';
 @NgModule({
   imports: [CommonModule, FormsModule],
   exports: [NumberInputComponent],
-  declarations: [NumberInputComponent,NumberInputDirective],
+  declarations: [NumberInputComponent, NumberInputDirective],
   providers: []
 })
 export class NumberInputModule {}
diff --git a/projects/ngx-formentry/src/components/radio-button/radio.component.html b/projects/ngx-formentry/src/components/radio-button/radio.component.html
index 7df25fc4..0906ae12 100644
--- a/projects/ngx-formentry/src/components/radio-button/radio.component.html
+++ b/projects/ngx-formentry/src/components/radio-button/radio.component.html
@@ -2,7 +2,7 @@
   <div
     *ngFor="let option of options; let i = index"
     class="cds--form-item cds--radio-wrapper"
-    [ngClass]="{'inline': orientation === 'horizontal'}"
+    [ngClass]="{ inline: orientation === 'horizontal' }"
   >
     <label class="form-control no-border">
       <input
diff --git a/projects/ngx-formentry/src/components/radio-button/radio.component.ts b/projects/ngx-formentry/src/components/radio-button/radio.component.ts
index 811f6d29..dad2efde 100644
--- a/projects/ngx-formentry/src/components/radio-button/radio.component.ts
+++ b/projects/ngx-formentry/src/components/radio-button/radio.component.ts
@@ -1,4 +1,11 @@
-import { Component, Input, forwardRef, OnInit, OnChanges, SimpleChanges } from '@angular/core';
+import {
+  Component,
+  Input,
+  forwardRef,
+  OnInit,
+  OnChanges,
+  SimpleChanges
+} from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 @Component({
@@ -13,7 +20,8 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
     }
   ]
 })
-export class RadioButtonControlComponent implements ControlValueAccessor, OnInit, OnChanges {
+export class RadioButtonControlComponent
+  implements ControlValueAccessor, OnInit, OnChanges {
   @Input() public id: String;
   @Input() public options: Array<any>;
   @Input() public selected: any;
@@ -35,7 +43,9 @@ export class RadioButtonControlComponent implements ControlValueAccessor, OnInit
     }
   }
 
-  public registerOnChange(fn: (newValue?: any, emitModelEvent?: boolean) => void) {
+  public registerOnChange(
+    fn: (newValue?: any, emitModelEvent?: boolean) => void
+  ) {
     this.onChange = fn;
   }
 
@@ -44,7 +54,7 @@ export class RadioButtonControlComponent implements ControlValueAccessor, OnInit
   }
 
   get value(): any {
-    return this._value ?? "";
+    return this._value ?? '';
   }
 
   set value(value: any) {
@@ -82,9 +92,9 @@ export class RadioButtonControlComponent implements ControlValueAccessor, OnInit
 
   private updateSelectedOption(): void {
     if (this.selected) {
-      const maybeOpt = this.options.find(opt => opt.value === this.selected);
+      const maybeOpt = this.options.find((opt) => opt.value === this.selected);
       if (maybeOpt) {
-        this.options.forEach(opt => opt.checked = opt === maybeOpt);
+        this.options.forEach((opt) => (opt.checked = opt === maybeOpt));
         this.value = this.selected;
       }
     }
diff --git a/projects/ngx-formentry/src/form-entry/directives/historical-value.directive.ts b/projects/ngx-formentry/src/form-entry/directives/historical-value.directive.ts
index dad4b439..36d995e6 100644
--- a/projects/ngx-formentry/src/form-entry/directives/historical-value.directive.ts
+++ b/projects/ngx-formentry/src/form-entry/directives/historical-value.directive.ts
@@ -56,7 +56,7 @@ export class HistoricalValueDirective {
           this._node.question.renderingType === 'select' ||
           this._node.question.renderingType === 'multi-select' ||
           this._node.question.renderingType === 'single-select' ||
-          this._node.question.renderingType === 'radio' 
+          this._node.question.renderingType === 'radio'
         ) {
           display.text = this.historicalFieldHelper.getDisplayTextFromOptions(
             this._node.question,
diff --git a/projects/ngx-formentry/src/form-entry/form-factory/form-node.ts b/projects/ngx-formentry/src/form-entry/form-factory/form-node.ts
index 85264f30..2287cf5a 100644
--- a/projects/ngx-formentry/src/form-entry/form-factory/form-node.ts
+++ b/projects/ngx-formentry/src/form-entry/form-factory/form-node.ts
@@ -62,10 +62,10 @@ export abstract class NodeBase {
   public get path(): string {
     return this._path;
   }
-  removeAt(index: number) { }
+  removeAt(index: number) {}
 
-  createChildNode() { }
-  removeChildNode() { }
+  createChildNode() {}
+  removeChildNode() {}
 }
 
 export class LeafNode extends NodeBase {
diff --git a/projects/ngx-formentry/src/form-entry/form-factory/form.factory.spec.ts b/projects/ngx-formentry/src/form-entry/form-factory/form.factory.spec.ts
index 43e31a67..ae298377 100644
--- a/projects/ngx-formentry/src/form-entry/form-factory/form.factory.spec.ts
+++ b/projects/ngx-formentry/src/form-entry/form-factory/form.factory.spec.ts
@@ -281,7 +281,7 @@ describe('Form Factory:', () => {
     expect((thirdLevel.children['key1'] as LeafNode).control).toBeTruthy();
     expect(
       (thirdLevel.children['key1'] as LeafNode).control instanceof
-      AfeFormControl
+        AfeFormControl
     ).toBe(true);
     const control = (thirdLevel.children['key1'] as LeafNode)
       .control as AfeFormControl;
@@ -304,7 +304,7 @@ describe('Form Factory:', () => {
           min: 0,
           max: 10
         }
-      },
+      }
     });
 
     const testQuestion = new TextInputQuestion({
diff --git a/projects/ngx-formentry/src/form-entry/form-factory/validation.factory.ts b/projects/ngx-formentry/src/form-entry/form-factory/validation.factory.ts
index 9465910b..bad54f7a 100644
--- a/projects/ngx-formentry/src/form-entry/form-factory/validation.factory.ts
+++ b/projects/ngx-formentry/src/form-entry/form-factory/validation.factory.ts
@@ -59,7 +59,9 @@ export class ValidationFactory {
             break;
           case 'maxlength':
             list.push(
-              this.maxLengthValidator((<MaxLengthValidationModel>validator).maxlength)
+              this.maxLengthValidator(
+                (<MaxLengthValidationModel>validator).maxlength
+              )
             );
             break;
           case 'min':
@@ -69,7 +71,9 @@ export class ValidationFactory {
             break;
           case 'minlength':
             list.push(
-              this.minLengthValidator((<MinLengthValidationModel>validator).minlength)
+              this.minLengthValidator(
+                (<MinLengthValidationModel>validator).minlength
+              )
             );
             break;
           case 'conditionalRequired':
diff --git a/projects/ngx-formentry/src/form-entry/helpers/historical-expression-helper-service.ts b/projects/ngx-formentry/src/form-entry/helpers/historical-expression-helper-service.ts
index 68e72fa5..dbc90286 100644
--- a/projects/ngx-formentry/src/form-entry/helpers/historical-expression-helper-service.ts
+++ b/projects/ngx-formentry/src/form-entry/helpers/historical-expression-helper-service.ts
@@ -15,7 +15,7 @@ export class HistoricalHelperService {
   public evaluate(
     expr: string,
     dataSources: Record<string, unknown>,
-    additionalScopeValues: Record<string, unknown> | null,
+    additionalScopeValues: Record<string, unknown> | null
   ) {
     const HD = new HistoricalEncounterDataService();
     HD.registerEncounters('prevEnc', dataSources['rawPrevEnc']);
diff --git a/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.spec.ts b/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.spec.ts
index a9543eaf..d82425ef 100644
--- a/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.spec.ts
+++ b/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.spec.ts
@@ -44,17 +44,23 @@ describe('JS Expression Helper Service:', () => {
 
     let obsValue;
 
-    obsValue = helper.getObsFromControlOrEncounter(null,{
-      obs: [{
-        uuid: '0bc6ef97-7727-4787-8c16-fc21460ccdydfd',
-        obsDatetime: '2016-01-21T01:17:46.000+0300',
-        concept: {
-          uuid: '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        },
-        value: 173,
-        groupMembers: null
-      }]
-    }, '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
+    obsValue = helper.getObsFromControlOrEncounter(
+      null,
+      {
+        obs: [
+          {
+            uuid: '0bc6ef97-7727-4787-8c16-fc21460ccdydfd',
+            obsDatetime: '2016-01-21T01:17:46.000+0300',
+            concept: {
+              uuid: '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+            },
+            value: 173,
+            groupMembers: null
+          }
+        ]
+      },
+      '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+    );
     expect(obsValue).toBeTruthy();
 
     expect(obsValue).toBe(173);
@@ -109,7 +115,7 @@ describe('JS Expression Helper Service:', () => {
 
     val = 'REC12345-12345';
     expect(helper.doesNotMatchExpression(regexString, val)).toBe(false);
-  })
+  });
   it('should return the gravida value given term births and abortion count', () => {
     const helper: JsExpressionHelper = TestBed.inject(JsExpressionHelper);
 
@@ -121,5 +127,5 @@ describe('JS Expression Helper Service:', () => {
     parityTerm = 1;
     parityAbortion = 2;
     expect(helper.calcGravida(parityTerm, parityAbortion)).toBe(4);
-  })
+  });
 });
diff --git a/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.ts b/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.ts
index 8ee2c775..0b4e9a48 100644
--- a/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.ts
+++ b/projects/ngx-formentry/src/form-entry/helpers/js-expression-helper.ts
@@ -166,18 +166,30 @@ export class JsExpressionHelper {
     return height && weight && refSectionObject ? formattedSDValue : null;
   }
 
-
-
-  calcSouthEastAsiaNonLabCVDRisk(sex: 'M' | 'F', smoker?: boolean, age?: number, sbp?: number, bmi?: number) {
-    const hasValidValues = (typeof sex === "string" && typeof smoker === "boolean" && typeof age === "number" && typeof sbp === "number" && typeof bmi === "number");
+  calcSouthEastAsiaNonLabCVDRisk(
+    sex: 'M' | 'F',
+    smoker?: boolean,
+    age?: number,
+    sbp?: number,
+    bmi?: number
+  ) {
+    const hasValidValues =
+      typeof sex === 'string' &&
+      typeof smoker === 'boolean' &&
+      typeof age === 'number' &&
+      typeof sbp === 'number' &&
+      typeof bmi === 'number';
 
     if (!hasValidValues) {
       return null;
     }
     // Bin functions
-    const getAgeBin = (age) => Math.floor((Math.min(Math.max(40, age), 74) - 40) / 5);
-    const getSbpBin = (sbp) => Math.max(0, Math.floor((Math.min(sbp, 180) - 120) / 20) + 1);
-    const getBmiBin = (bmi) => Math.max(0, Math.floor((Math.min(bmi, 35) - 20) / 5) + 1);
+    const getAgeBin = (age) =>
+      Math.floor((Math.min(Math.max(40, age), 74) - 40) / 5);
+    const getSbpBin = (sbp) =>
+      Math.max(0, Math.floor((Math.min(sbp, 180) - 120) / 20) + 1);
+    const getBmiBin = (bmi) =>
+      Math.max(0, Math.floor((Math.min(bmi, 35) - 20) / 5) + 1);
 
     // Variables
     const sexIdx = sex === 'M' ? 0 : 1;
@@ -186,7 +198,9 @@ export class JsExpressionHelper {
     const bmiIdx = getBmiBin(bmi);
     const sbpIdx = 4 - getSbpBin(sbp);
 
-    return southEastAsiaCvdRiskTables[sexIdx][smokerIdx][ageIdx][sbpIdx][bmiIdx];
+    return southEastAsiaCvdRiskTables[sexIdx][smokerIdx][ageIdx][sbpIdx][
+      bmiIdx
+    ];
   }
 
   isEmpty(val) {
@@ -276,21 +290,34 @@ export class JsExpressionHelper {
    * @param uuid
    * @returns
    */
-  getObsFromControlOrEncounter(targetControl,rawEncounter,uuid): any {
+  getObsFromControlOrEncounter(targetControl, rawEncounter, uuid): any {
     const findObs = (obs, uuid) => {
       let result;
-      obs?.some(o => result = o?.concept?.uuid === uuid ? o : findObs(o.groupMembers || [], uuid));
+      obs?.some(
+        (o) =>
+          (result =
+            o?.concept?.uuid === uuid ? o : findObs(o.groupMembers || [], uuid))
+      );
       return result;
-    }
+    };
     const obsValue = findObs(rawEncounter?.obs, uuid)?.value;
-    return !!targetControl ? targetControl : typeof obsValue === 'object' ? obsValue.uuid : !!obsValue ? obsValue : null
+    return !!targetControl
+      ? targetControl
+      : typeof obsValue === 'object'
+      ? obsValue.uuid
+      : !!obsValue
+      ? obsValue
+      : null;
   }
 
-  doesNotMatchExpression(regexString: string, val: string | null | undefined): boolean {
+  doesNotMatchExpression(
+    regexString: string,
+    val: string | null | undefined
+  ): boolean {
     if (!val || ['undefined', 'null', ''].includes(val.toString())) {
       return true;
     }
-    const pattern = new RegExp(regexString); 
+    const pattern = new RegExp(regexString);
     if (!pattern.test(val)) {
       return true;
     }
diff --git a/projects/ngx-formentry/src/form-entry/helpers/risk-dataset-table.ts b/projects/ngx-formentry/src/form-entry/helpers/risk-dataset-table.ts
index 4eadab85..b2bba52d 100644
--- a/projects/ngx-formentry/src/form-entry/helpers/risk-dataset-table.ts
+++ b/projects/ngx-formentry/src/form-entry/helpers/risk-dataset-table.ts
@@ -13,7 +13,7 @@ export const southEastAsiaCvdRiskTables = [
         [21, 23, 25, 26, 28], // SBP 160-179
         [17, 19, 20, 21, 23], // SBP 140-159
         [14, 15, 16, 17, 18], // SBP 120-139
-        [11, 12, 13, 14, 15], // sbp < 120
+        [11, 12, 13, 14, 15] // sbp < 120
       ],
       // Age 65 - 69
       [
@@ -21,7 +21,7 @@ export const southEastAsiaCvdRiskTables = [
         [16, 17, 19, 21, 22], // sbp 160-179
         [12, 14, 15, 16, 18], // sbp 140-159
         [10, 11, 12, 13, 14], // sbp 120-139
-        [8, 8, 9, 10, 11], // < 120
+        [8, 8, 9, 10, 11] // < 120
       ],
       // Age 60 - 64
       [
@@ -29,7 +29,7 @@ export const southEastAsiaCvdRiskTables = [
         [12, 13, 14, 16, 18], // sbp 160-179
         [9, 10, 11, 12, 14], // sbp 140-159
         [7, 8, 8, 9, 10], // sbp 120-139
-        [5, 6, 6, 7, 8], // sbp < 120
+        [5, 6, 6, 7, 8] // sbp < 120
       ],
       // Age 55 - 59
       [
@@ -37,7 +37,7 @@ export const southEastAsiaCvdRiskTables = [
         [9, 10, 11, 12, 14], // sbp 160-179
         [7, 7, 8, 9, 10], // sbp 140-159
         [5, 5, 6, 7, 8], // sbp 120-139
-        [4, 4, 4, 5, 6], // sbp < 120
+        [4, 4, 4, 5, 6] // sbp < 120
       ],
       // Age 50 - 54
       [
@@ -45,7 +45,7 @@ export const southEastAsiaCvdRiskTables = [
         [7, 7, 8, 9, 11], // sbp 160-179
         [5, 5, 6, 7, 8], // sbp 140-159
         [3, 4, 4, 5, 6], // sbp 120-139
-        [2, 3, 3, 4, 4], // sbp < 120
+        [2, 3, 3, 4, 4] // sbp < 120
       ],
       // Age 45 - 49
       [
@@ -53,7 +53,7 @@ export const southEastAsiaCvdRiskTables = [
         [5, 6, 6, 7, 8], // 160-179
         [3, 4, 4, 5, 6], // 140-159
         [2, 3, 3, 4, 4], // 120-139
-        [2, 2, 2, 2, 3], // < 120
+        [2, 2, 2, 2, 3] // < 120
       ],
       // Age 40 - 44
       [
@@ -61,8 +61,8 @@ export const southEastAsiaCvdRiskTables = [
         [4, 4, 5, 6, 7], // 160-179
         [2, 3, 3, 4, 4], // 140-159
         [2, 2, 2, 3, 3], // 120-139
-        [1, 1, 2, 2, 2],
-      ],
+        [1, 1, 2, 2, 2]
+      ]
     ],
 
     // Smoker
@@ -73,7 +73,7 @@ export const southEastAsiaCvdRiskTables = [
         [28, 30, 32, 34, 36], // 160-179
         [23, 24, 26, 28, 30], // 140-159
         [18, 20, 21, 23, 24], // 120-139
-        [15, 16, 17, 18, 20], // < 120
+        [15, 16, 17, 18, 20] // < 120
       ],
       // Age 65 - 69
       [
@@ -81,7 +81,7 @@ export const southEastAsiaCvdRiskTables = [
         [22, 24, 26, 29, 31], // 160-179
         [18, 19, 21, 23, 25], // 140-159
         [14, 15, 16, 18, 20], // 120-139
-        [11, 12, 13, 14, 16], // < 120
+        [11, 12, 13, 14, 16] // < 120
       ],
       // Age 60 - 64
       [
@@ -89,7 +89,7 @@ export const southEastAsiaCvdRiskTables = [
         [18, 18, 20, 22, 24], // 160-179
         [14, 15, 17, 19, 21], // 140-159
         [10, 12, 13, 14, 16], // 120-139
-        [8, 9, 10, 11, 12], // < 120
+        [8, 9, 10, 11, 12] // < 120
       ],
       // Age 55 - 59
       [
@@ -97,7 +97,7 @@ export const southEastAsiaCvdRiskTables = [
         [14, 16, 18, 20, 23], // 160-179
         [11, 12, 13, 15, 17], // 140-159
         [8, 9, 10, 11, 13], // 120-139
-        [6, 7, 7, 8, 10],
+        [6, 7, 7, 8, 10]
       ],
       // Age 50 - 54
       [
@@ -105,7 +105,7 @@ export const southEastAsiaCvdRiskTables = [
         [11, 13, 15, 17, 20], // 160-179
         [8, 9, 11, 12, 14], // 140-159
         [6, 7, 8, 9, 11], // 120-139
-        [4, 5, 6, 7, 8],
+        [4, 5, 6, 7, 8]
       ],
       // Age 45 - 49
       [
@@ -113,7 +113,7 @@ export const southEastAsiaCvdRiskTables = [
         [9, 10, 12, 14, 17], // 160-179
         [6, 7, 9, 10, 12], // 140-159
         [4, 5, 6, 7, 8], // 120-139
-        [3, 4, 4, 5, 6],
+        [3, 4, 4, 5, 6]
       ],
       // Age 40 - 44
       [
@@ -121,9 +121,9 @@ export const southEastAsiaCvdRiskTables = [
         [7, 8, 10, 12, 14], // 160-179
         [5, 6, 7, 8, 10], // 140-159
         [3, 4, 5, 6, 7], // 120-139
-        [2, 3, 3, 4, 5],
-      ],
-    ],
+        [2, 3, 3, 4, 5]
+      ]
+    ]
   ],
 
   // Women
@@ -136,7 +136,7 @@ export const southEastAsiaCvdRiskTables = [
         [17, 18, 19, 19, 20], // 160-179
         [15, 15, 16, 16, 17], // 140-159
         [12, 12, 13, 13, 14], // 120-139
-        [10, 10, 11, 11, 11], // < 120
+        [10, 10, 11, 11, 11] // < 120
       ],
       // Age 65 - 69
       [
@@ -144,7 +144,7 @@ export const southEastAsiaCvdRiskTables = [
         [13, 14, 14, 15, 15], // 160-179
         [11, 11, 11, 12, 12], // 140-159
         [9, 9, 9, 10, 10], // 120-139
-        [7, 7, 7, 8, 8],
+        [7, 7, 7, 8, 8]
       ],
       // Age 60 - 64
       [
@@ -152,7 +152,7 @@ export const southEastAsiaCvdRiskTables = [
         [10, 10, 11, 11, 12], // 160-179
         [8, 8, 8, 9, 9], // 140-159
         [6, 6, 7, 7, 7], // 120-139
-        [5, 5, 5, 5, 6],
+        [5, 5, 5, 5, 6]
       ],
       // Age 55 - 59
       [
@@ -160,7 +160,7 @@ export const southEastAsiaCvdRiskTables = [
         [8, 8, 8, 9, 9], // 160-179
         [6, 6, 6, 7, 7], // 140-159
         [4, 5, 5, 5, 5], // 120-139
-        [3, 3, 4, 4, 4],
+        [3, 3, 4, 4, 4]
       ],
       // Age 50 - 54
       [
@@ -168,7 +168,7 @@ export const southEastAsiaCvdRiskTables = [
         [6, 6, 6, 7, 7], // 160-179
         [4, 4, 5, 5, 5], // 140-159
         [3, 3, 3, 4, 4], // 120-139
-        [2, 2, 3, 3, 3],
+        [2, 2, 3, 3, 3]
       ],
       // Age 45 - 49
       [
@@ -176,7 +176,7 @@ export const southEastAsiaCvdRiskTables = [
         [4, 5, 5, 5, 5], // 160-179
         [3, 3, 3, 4, 4], // 140-159
         [2, 2, 2, 3, 3], // 120-139
-        [2, 2, 2, 2, 2],
+        [2, 2, 2, 2, 2]
       ],
       // Age 40 - 44
       [
@@ -184,8 +184,8 @@ export const southEastAsiaCvdRiskTables = [
         [3, 3, 4, 4, 4], // 160-179
         [2, 2, 3, 3, 3], // 140-159
         [2, 2, 2, 2, 2], // 120-139
-        [1, 1, 1, 1, 1],
-      ],
+        [1, 1, 1, 1, 1]
+      ]
     ],
 
     // Smoker
@@ -196,7 +196,7 @@ export const southEastAsiaCvdRiskTables = [
         [25, 26, 27, 28, 29], // 160-179
         [21, 22, 22, 23, 24], // 140-159
         [17, 18, 19, 19, 20], // 120-139
-        [14, 15, 15, 16, 17],
+        [14, 15, 15, 16, 17]
       ],
       // Age 65 - 69
       [
@@ -204,7 +204,7 @@ export const southEastAsiaCvdRiskTables = [
         [21, 22, 22, 23, 24], // 160-179
         [17, 18, 18, 19, 20], // 140-159
         [14, 14, 15, 15, 16], // 120-139
-        [11, 11, 12, 12, 13],
+        [11, 11, 12, 12, 13]
       ],
       // Age 60 - 64
       [
@@ -212,7 +212,7 @@ export const southEastAsiaCvdRiskTables = [
         [17, 18, 19, 20, 21], // 160-179
         [13, 14, 15, 16, 16], // 140-159
         [11, 11, 12, 12, 13], // 120-139
-        [8, 9, 9, 10, 10],
+        [8, 9, 9, 10, 10]
       ],
       // Age 55 - 59
       [
@@ -220,7 +220,7 @@ export const southEastAsiaCvdRiskTables = [
         [14, 15, 15, 16, 17], // 160-179
         [11, 11, 12, 13, 13], // 140-159
         [8, 9, 9, 10, 10], // 120-139
-        [6, 7, 7, 7, 8],
+        [6, 7, 7, 7, 8]
       ],
       // Age 50 - 54
       [
@@ -228,7 +228,7 @@ export const southEastAsiaCvdRiskTables = [
         [11, 12, 13, 14, 14], // 160-179
         [9, 9, 10, 10, 11], // 140-159
         [6, 7, 7, 8, 8], // 120-139
-        [5, 5, 5, 6, 6],
+        [5, 5, 5, 6, 6]
       ],
       // Age 45 - 49
       [
@@ -236,7 +236,7 @@ export const southEastAsiaCvdRiskTables = [
         [9, 10, 11, 11, 12], // 160-179
         [7, 7, 8, 8, 9], // 140-159
         [5, 5, 6, 6, 6], // 120-139
-        [4, 4, 4, 4, 5],
+        [4, 4, 4, 4, 5]
       ],
       // Age 40 - 44
       [
@@ -244,8 +244,8 @@ export const southEastAsiaCvdRiskTables = [
         [8, 8, 9, 9, 10], // 160-179
         [5, 6, 6, 7, 7], // 140-159
         [4, 4, 4, 5, 5], // 120-139
-        [3, 3, 3, 3, 4],
-      ],
-    ],
-  ],
+        [3, 3, 3, 3, 4]
+      ]
+    ]
+  ]
 ];
diff --git a/projects/ngx-formentry/src/form-entry/question-models/interfaces/diagnosis-question-options.ts b/projects/ngx-formentry/src/form-entry/question-models/interfaces/diagnosis-question-options.ts
index 54e6ec36..ee7027e0 100644
--- a/projects/ngx-formentry/src/form-entry/question-models/interfaces/diagnosis-question-options.ts
+++ b/projects/ngx-formentry/src/form-entry/question-models/interfaces/diagnosis-question-options.ts
@@ -1,5 +1,5 @@
 import { BaseOptions } from '../interfaces/base-options';
-import {DataSource} from "./data-source";
+import { DataSource } from './data-source';
 export interface DiagnosisQuestionOptions extends BaseOptions {
   dataSource?: string;
   rendering: string;
diff --git a/projects/ngx-formentry/src/form-entry/question-models/max-length-validation.model.ts b/projects/ngx-formentry/src/form-entry/question-models/max-length-validation.model.ts
index acccc8a7..b6f89c09 100644
--- a/projects/ngx-formentry/src/form-entry/question-models/max-length-validation.model.ts
+++ b/projects/ngx-formentry/src/form-entry/question-models/max-length-validation.model.ts
@@ -1,11 +1,11 @@
 import { ValidationModel } from './validation.model';
 
 export class MaxLengthValidationModel extends ValidationModel {
- maxlength: number;
+  maxlength: number;
 
   constructor(validations: any) {
     super(validations);
     const maxlength: any = validations.maxlength;
     this.maxlength = +maxlength;
   }
-}
\ No newline at end of file
+}
diff --git a/projects/ngx-formentry/src/form-entry/question-models/min-length-validation.model.ts b/projects/ngx-formentry/src/form-entry/question-models/min-length-validation.model.ts
index bfe1e7ab..1c8e07fa 100644
--- a/projects/ngx-formentry/src/form-entry/question-models/min-length-validation.model.ts
+++ b/projects/ngx-formentry/src/form-entry/question-models/min-length-validation.model.ts
@@ -1,11 +1,11 @@
 import { ValidationModel } from './validation.model';
 
 export class MinLengthValidationModel extends ValidationModel {
- minlength: number;
+  minlength: number;
 
   constructor(validations: any) {
     super(validations);
     const minlength: any = validations.minlength;
     this.minlength = +minlength;
   }
-}
\ No newline at end of file
+}
diff --git a/projects/ngx-formentry/src/form-entry/validators/max-length.validator.ts b/projects/ngx-formentry/src/form-entry/validators/max-length.validator.ts
index d9e902f9..9d4ed30d 100644
--- a/projects/ngx-formentry/src/form-entry/validators/max-length.validator.ts
+++ b/projects/ngx-formentry/src/form-entry/validators/max-length.validator.ts
@@ -8,7 +8,7 @@ export class MaxLengthValidator {
       }
 
       if (control.value && control.value.length !== 0) {
-        const v = (control.value).toString().length;
+        const v = control.value.toString().length;
         return v <= maxLength
           ? null
           : { maxlength: { requiredLength: maxLength, actualValue: v } };
diff --git a/projects/ngx-formentry/src/form-entry/validators/min-length.validator.ts b/projects/ngx-formentry/src/form-entry/validators/min-length.validator.ts
index e318d73e..e006a91a 100644
--- a/projects/ngx-formentry/src/form-entry/validators/min-length.validator.ts
+++ b/projects/ngx-formentry/src/form-entry/validators/min-length.validator.ts
@@ -8,7 +8,7 @@ export class MinLengthValidator {
       }
 
       if (control.value && control.value.length !== 0) {
-        const v = (control.value).toString().length;
+        const v = control.value.toString().length;
         return v >= minLength
           ? null
           : { minlength: { requiredLength: minLength, actualValue: v } };
diff --git a/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.spec.ts b/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.spec.ts
index 34bf302d..9546d751 100644
--- a/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.spec.ts
+++ b/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.spec.ts
@@ -1,19 +1,19 @@
-import {TestBed} from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 
 const adultForm = require('../../adult.json');
 const adultFormDiagnoses = require('../../mock/diagnoses.json');
-import {FormFactory} from '../../form-entry/form-factory/form.factory';
-import {FormControlService} from '../../form-entry/form-factory/form-control.service';
-import {ValidationFactory} from '../../form-entry/form-factory/validation.factory';
-import {QuestionFactory} from '../../form-entry/form-factory/question.factory';
-import {OrderValueAdapter} from './order.adapter';
-import {HidersDisablersFactory} from '../../form-entry/form-factory/hiders-disablers.factory';
-import {AlertsFactory} from '../form-factory/show-messages.factory';
-import {ExpressionRunner} from '../../form-entry/expression-runner/expression-runner';
-import {JsExpressionHelper} from '../../form-entry/helpers/js-expression-helper';
-import {ControlRelationsFactory} from '../../form-entry/form-factory/control-relations.factory';
-import {DebugModeService} from './../services/debug-mode.service';
-import {Diagnosis, DiagnosisValueAdapter} from './diagnosis.adapter';
+import { FormFactory } from '../../form-entry/form-factory/form.factory';
+import { FormControlService } from '../../form-entry/form-factory/form-control.service';
+import { ValidationFactory } from '../../form-entry/form-factory/validation.factory';
+import { QuestionFactory } from '../../form-entry/form-factory/question.factory';
+import { OrderValueAdapter } from './order.adapter';
+import { HidersDisablersFactory } from '../../form-entry/form-factory/hiders-disablers.factory';
+import { AlertsFactory } from '../form-factory/show-messages.factory';
+import { ExpressionRunner } from '../../form-entry/expression-runner/expression-runner';
+import { JsExpressionHelper } from '../../form-entry/helpers/js-expression-helper';
+import { ControlRelationsFactory } from '../../form-entry/form-factory/control-relations.factory';
+import { DebugModeService } from './../services/debug-mode.service';
+import { Diagnosis, DiagnosisValueAdapter } from './diagnosis.adapter';
 
 describe('Diagnosis Value Adapter', () => {
   let formFactory: FormFactory;
@@ -55,10 +55,10 @@ describe('Diagnosis Value Adapter', () => {
       diagnosis: {
         coded: {
           uuid: '116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-          display: 'Malarial Fever',
-        },
+          display: 'Malarial Fever'
+        }
       },
-      voided: false,
+      voided: false
     },
     {
       uuid: 'diagnosis-2-uuid5',
@@ -68,10 +68,10 @@ describe('Diagnosis Value Adapter', () => {
       diagnosis: {
         coded: {
           uuid: '113511AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-          display: 'Puerperal Fever',
-        },
+          display: 'Puerperal Fever'
+        }
       },
-      voided: false,
+      voided: false
     }
   ];
 
@@ -88,7 +88,8 @@ describe('Diagnosis Value Adapter', () => {
       let index = 0;
 
       for (const diagnosis of newDiagnoses) {
-        const node = diagnosisValueAdapter.formDiagnosisNodes[diagnosis.rank - 1];
+        const node =
+          diagnosisValueAdapter.formDiagnosisNodes[diagnosis.rank - 1];
         node.createChildNode();
         const value = {};
         value[node.question.key] = diagnosis.diagnosis.coded.uuid;
@@ -98,16 +99,36 @@ describe('Diagnosis Value Adapter', () => {
       }
 
       // Confirm controls where populated with data;
-      expect(diagnosisValueAdapter.formDiagnosisNodes[0].control.value[0].primaryDiagnosisId).toEqual('116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
-      expect(diagnosisValueAdapter.formDiagnosisNodes[1].control.value[0].secondaryDiagnosisId).toEqual('113511AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
+      expect(
+        diagnosisValueAdapter.formDiagnosisNodes[0].control.value[0]
+          .primaryDiagnosisId
+      ).toEqual('116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
+      expect(
+        diagnosisValueAdapter.formDiagnosisNodes[1].control.value[0]
+          .secondaryDiagnosisId
+      ).toEqual('113511AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
 
       // Confirm payload was generated;
       const payload = diagnosisValueAdapter.generateFormPayload(form);
-      expect(payload.find(p => p.diagnosis.coded == '116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')).toBeTruthy();
-      expect(payload.find(p => p.diagnosis.coded == '113511AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')).toBeTruthy();
+      expect(
+        payload.find(
+          (p) => p.diagnosis.coded == '116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+        )
+      ).toBeTruthy();
+      expect(
+        payload.find(
+          (p) => p.diagnosis.coded == '113511AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+        )
+      ).toBeTruthy();
 
       // Confirm deleted diagnoses were added to the payload
-      expect(payload.find(p => p.diagnosis.coded == '5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && p.voided)).toBeTruthy();
+      expect(
+        payload.find(
+          (p) =>
+            p.diagnosis.coded == '5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' &&
+            p.voided
+        )
+      ).toBeTruthy();
     });
   });
 
@@ -116,12 +137,17 @@ describe('Diagnosis Value Adapter', () => {
       const form = formFactory.createForm(adultForm);
       diagnosisValueAdapter.populateForm(form, adultFormDiagnoses.diagnoses);
 
-      expect(diagnosisValueAdapter.formDiagnosisNodes.filter(n => {
-          return n.control.value.find(v => {
-            return v.secondaryDiagnosisId == '5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && v.secondaryDiagnosisId.display == 'FEVER';
+      expect(
+        diagnosisValueAdapter.formDiagnosisNodes.filter((n) => {
+          return n.control.value.find((v) => {
+            return (
+              v.secondaryDiagnosisId ==
+                '5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' &&
+              v.secondaryDiagnosisId.display == 'FEVER'
+            );
           });
-        }
-      )).toBeTruthy();
+        })
+      ).toBeTruthy();
     });
   });
 });
diff --git a/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.ts b/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.ts
index a67fb4be..de321dce 100644
--- a/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.ts
+++ b/projects/ngx-formentry/src/form-entry/value-adapters/diagnosis.adapter.ts
@@ -1,6 +1,6 @@
-import {Injectable} from '@angular/core';
-import {Form} from '../form-factory/form';
-import {ValueAdapter} from './value.adapter';
+import { Injectable } from '@angular/core';
+import { Form } from '../form-factory/form';
+import { ValueAdapter } from './value.adapter';
 
 @Injectable()
 export class DiagnosisValueAdapter implements ValueAdapter {
@@ -9,33 +9,46 @@ export class DiagnosisValueAdapter implements ValueAdapter {
   generateFormPayload(form: Form) {
     this.formDiagnosisNodes = [];
     this._findDiagnosisQuestionNodes(form.rootNode);
-    return this._createDiagnosesPayload(this.formDiagnosisNodes, form.existingDiagnoses);
+    return this._createDiagnosesPayload(
+      this.formDiagnosisNodes,
+      form.existingDiagnoses
+    );
   }
 
-  populateForm(form: Form, diagnoses:Array<Diagnosis>) {
-    form.existingDiagnoses = diagnoses?.filter(d => {
+  populateForm(form: Form, diagnoses: Array<Diagnosis>) {
+    form.existingDiagnoses = diagnoses?.filter((d) => {
       return !d.voided;
     });
     this.formDiagnosisNodes = [];
     this._findDiagnosisQuestionNodes(form.rootNode);
-    this._setDiagnosesValues(this.formDiagnosisNodes, form.existingDiagnoses, 1);
-    this._setDiagnosesValues(this.formDiagnosisNodes, form.existingDiagnoses, 2);
+    this._setDiagnosesValues(
+      this.formDiagnosisNodes,
+      form.existingDiagnoses,
+      1
+    );
+    this._setDiagnosesValues(
+      this.formDiagnosisNodes,
+      form.existingDiagnoses,
+      2
+    );
   }
 
   private _createDiagnosesPayload(diagnosisNodes, existingDiagnoses) {
     const payload: Array<DiagnosisPayload> = [];
     let deletedDiagnoses: Array<DiagnosisPayload> = [];
 
-    diagnosisNodes?.forEach(node => {
-      node.control.value.filter(v => v[node.question.key]).forEach(value => {
-        // Create Payload
-        const payloadDiagnosis = this._createPayloadDiagnosis(
-          value[node.question.key],
-          node.question.extras
-        );
-        // Validate if is new value
+    diagnosisNodes?.forEach((node) => {
+      node.control.value
+        .filter((v) => v[node.question.key])
+        .forEach((value) => {
+          // Create Payload
+          const payloadDiagnosis = this._createPayloadDiagnosis(
+            value[node.question.key],
+            node.question.extras
+          );
+          // Validate if is new value
           payload.push(payloadDiagnosis);
-      });
+        });
     });
 
     this._updatedOldDiagnoses(payload, existingDiagnoses);
@@ -46,7 +59,7 @@ export class DiagnosisValueAdapter implements ValueAdapter {
   private _createPayloadDiagnosis(codedUuid, questionExtras): DiagnosisPayload {
     const diagnosis: DiagnosisPayload = {
       diagnosis: {
-        coded: codedUuid,
+        coded: codedUuid
       },
       certainty: 'CONFIRMED',
       rank: questionExtras.questionOptions.rank,
@@ -56,40 +69,57 @@ export class DiagnosisValueAdapter implements ValueAdapter {
     return diagnosis;
   }
 
-  private _getDeletedDiagnoses(payloadDiagnoses: Array<DiagnosisPayload>, existingDiagnoses: Array<Diagnosis>): Array<DiagnosisPayload> {
-    return existingDiagnoses?.filter(e => {
-      return !payloadDiagnoses.find(p => {
-        let isSame = !e.voided && p.diagnosis.coded === e.diagnosis.coded.uuid;
-        return isSame;
+  private _getDeletedDiagnoses(
+    payloadDiagnoses: Array<DiagnosisPayload>,
+    existingDiagnoses: Array<Diagnosis>
+  ): Array<DiagnosisPayload> {
+    return existingDiagnoses
+      ?.filter((e) => {
+        return !payloadDiagnoses.find((p) => {
+          let isSame =
+            !e.voided && p.diagnosis.coded === e.diagnosis.coded.uuid;
+          return isSame;
+        });
+      })
+      .map((d) => {
+        let diagnosisPayload = this._convert(d);
+        diagnosisPayload.voided = true;
+        return diagnosisPayload;
       });
-    }).map(d => {
-      let diagnosisPayload = this._convert(d);
-      diagnosisPayload.voided = true;
-      return diagnosisPayload;
-    });
   }
 
-  private _updatedOldDiagnoses(payloadDiagnoses: Array<DiagnosisPayload>, existingDiagnoses: Array<Diagnosis>) {
-     payloadDiagnoses.forEach(p => {
-       existingDiagnoses?.forEach(e => {
-         let isSame = !e.voided && p.diagnosis.coded === e.diagnosis.coded.uuid;
-         p.uuid = isSame ? e.uuid : null;
-       });
-     });
+  private _updatedOldDiagnoses(
+    payloadDiagnoses: Array<DiagnosisPayload>,
+    existingDiagnoses: Array<Diagnosis>
+  ) {
+    payloadDiagnoses.forEach((p) => {
+      existingDiagnoses?.forEach((e) => {
+        let isSame = !e.voided && p.diagnosis.coded === e.diagnosis.coded.uuid;
+        p.uuid = isSame ? e.uuid : null;
+      });
+    });
   }
 
-  private _setDiagnosesValues(formDiagnosisNodes, existingDiagnoses: Array<Diagnosis>, rank: number) {
-    formDiagnosisNodes?.filter(node => node.question.extras.questionOptions.rank == rank).forEach(node => {
-      node['initialValue'] = existingDiagnoses;
-      existingDiagnoses.filter(d => d.rank == rank).forEach((diagnosis, index) => {
-        node.createChildNode();
-        const value = {};
-        value[node.question.key] = diagnosis.diagnosis.coded.uuid;
-        const childNode = node.children[index];
-        childNode.control.setValue(value);
-        childNode['initialValue'] = value;
+  private _setDiagnosesValues(
+    formDiagnosisNodes,
+    existingDiagnoses: Array<Diagnosis>,
+    rank: number
+  ) {
+    formDiagnosisNodes
+      ?.filter((node) => node.question.extras.questionOptions.rank == rank)
+      .forEach((node) => {
+        node['initialValue'] = existingDiagnoses;
+        existingDiagnoses
+          .filter((d) => d.rank == rank)
+          .forEach((diagnosis, index) => {
+            node.createChildNode();
+            const value = {};
+            value[node.question.key] = diagnosis.diagnosis.coded.uuid;
+            const childNode = node.children[index];
+            childNode.control.setValue(value);
+            childNode['initialValue'] = value;
+          });
       });
-    });
   }
 
   private _findDiagnosisQuestionNodes(formNode) {
@@ -112,7 +142,13 @@ export class DiagnosisValueAdapter implements ValueAdapter {
                   for (const node in formNode.children) {
                     const question = formNode.children[node].question;
                     const index = formNode.children[node].nodeIndex;
-                    if (question.extras && question.extras.type === 'diagnosis' && !this.formDiagnosisNodes.some(x => index === x.nodeIndex)) {
+                    if (
+                      question.extras &&
+                      question.extras.type === 'diagnosis' &&
+                      !this.formDiagnosisNodes.some(
+                        (x) => index === x.nodeIndex
+                      )
+                    ) {
                       this.formDiagnosisNodes.push(formNode.children[node]);
                     }
                   }
@@ -134,12 +170,12 @@ export class DiagnosisValueAdapter implements ValueAdapter {
       patient: diagnosis.patient,
       diagnosis: {
         coded: diagnosis.diagnosis.coded.uuid,
-        nonCoded: diagnosis.diagnosis.nonCoded,
+        nonCoded: diagnosis.diagnosis.nonCoded
       },
       certainty: diagnosis.certainty,
       rank: diagnosis.rank,
-      voided: diagnosis.voided,
-    }
+      voided: diagnosis.voided
+    };
   }
 }
 
diff --git a/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.spec.ts b/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.spec.ts
index 1fbb5785..2d9f1f6c 100644
--- a/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.spec.ts
+++ b/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.spec.ts
@@ -23,7 +23,7 @@ import adultForm from '../../adult.json';
 import adultFormOrders from '../../mock/orders.json';
 import adultFormDiagnoses from '../../mock/diagnoses.json';
 import adultFormObs from '../../mock/obs.json';
-import { DiagnosisValueAdapter } from "./diagnosis.adapter";
+import { DiagnosisValueAdapter } from './diagnosis.adapter';
 
 describe('Encounter Value Adapter:', () => {
   let adultFormSchema: any;
@@ -142,7 +142,10 @@ describe('Encounter Value Adapter:', () => {
     });
 
     // Check that it populated diagnoses
-    expect(adapter.diagnosesAdapter.formDiagnosisNodes[1].control.value[0].secondaryDiagnosisId).toEqual('5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
+    expect(
+      adapter.diagnosesAdapter.formDiagnosisNodes[1].control.value[0]
+        .secondaryDiagnosisId
+    ).toEqual('5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
   });
 
   it('should generate encounter payload', () => {
@@ -218,10 +221,13 @@ describe('Encounter Value Adapter:', () => {
     (createdNode.children['order1'] as LeafNode).control.setValue('new-order');
 
     // change diagnoses
-    let primaryDiagnosisNode = form.searchNodeByQuestionId('primaryDiagnosisId')[0];
+    let primaryDiagnosisNode = form.searchNodeByQuestionId(
+      'primaryDiagnosisId'
+    )[0];
     primaryDiagnosisNode.createChildNode();
     const value = {};
-    value[primaryDiagnosisNode.question.key] = '116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+    value[primaryDiagnosisNode.question.key] =
+      '116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
     const childNode = primaryDiagnosisNode.children[0];
     childNode.control.setValue(value);
 
@@ -252,7 +258,15 @@ describe('Encounter Value Adapter:', () => {
     expect(payload['orders'].length > 0).toBe(true);
 
     // check that it generated orders payload
-    expect(payload['diagnoses'].find(d => d.diagnosis.coded == '116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')).toBeTruthy();
-    expect(payload['diagnoses'].find(d => d.diagnosis.coded == '5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')).toBeTruthy();
+    expect(
+      payload['diagnoses'].find(
+        (d) => d.diagnosis.coded == '116125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+      )
+    ).toBeTruthy();
+    expect(
+      payload['diagnoses'].find(
+        (d) => d.diagnosis.coded == '5945AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+      )
+    ).toBeTruthy();
   });
 });
diff --git a/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.ts b/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.ts
index 804551c6..82fd6d27 100644
--- a/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.ts
+++ b/projects/ngx-formentry/src/form-entry/value-adapters/encounter.adapter.ts
@@ -86,7 +86,8 @@ export class EncounterAdapter implements ValueAdapter {
 
     payload['orders'] = this.ordersAdapter.generateFormPayload(form) || [];
 
-    payload['diagnoses'] = this.diagnosesAdapter.generateFormPayload(form) || [];
+    payload['diagnoses'] =
+      this.diagnosesAdapter.generateFormPayload(form) || [];
 
     return payload;
   }
@@ -153,7 +154,11 @@ export class EncounterAdapter implements ValueAdapter {
     }
 
     if (!payload.encounterDatetime) {
-      this.setPayloadEncounterDate(payload, form.valueProcessingInfo.encounterDatetime ?? new Date().toISOString(), form.valueProcessingInfo.utcOffset);
+      this.setPayloadEncounterDate(
+        payload,
+        form.valueProcessingInfo.encounterDatetime ?? new Date().toISOString(),
+        form.valueProcessingInfo.utcOffset
+      );
     }
 
     if (form.valueProcessingInfo.formUuid) {
@@ -180,10 +185,12 @@ export class EncounterAdapter implements ValueAdapter {
     payload['encounterType'] = encounterTypeUuid;
   }
 
-  setPayloadEncounterDate(payload, encounterDatetime: string, utcOffset: string) {
-    const dateValue = moment(encounterDatetime).utcOffset(
-      utcOffset || '+0300'
-    );
+  setPayloadEncounterDate(
+    payload,
+    encounterDatetime: string,
+    utcOffset: string
+  ) {
+    const dateValue = moment(encounterDatetime).utcOffset(utcOffset || '+0300');
     payload['encounterDatetime'] = dateValue.format();
   }
 
diff --git a/projects/ngx-formentry/src/form-entry/value-adapters/obs-adapter-helper.ts b/projects/ngx-formentry/src/form-entry/value-adapters/obs-adapter-helper.ts
index 82c2ff82..c7f3cc82 100644
--- a/projects/ngx-formentry/src/form-entry/value-adapters/obs-adapter-helper.ts
+++ b/projects/ngx-formentry/src/form-entry/value-adapters/obs-adapter-helper.ts
@@ -28,10 +28,14 @@ export class ObsAdapterHelper {
       (node instanceof GroupNode && node.question.extras.type === 'complex-obs')
     ) {
       _.each(obsArray, (item) => {
-        let questionId = this.getQuestionIdFromFormFieldPath(item.formFieldPath);
+        let questionId = this.getQuestionIdFromFormFieldPath(
+          item.formFieldPath
+        );
         if (
           (questionId && questionId === node?.question?.extras?.id) ||
-          (!questionId && item.concept && item.concept.uuid === node.question.extras.questionOptions.concept)
+          (!questionId &&
+            item.concept &&
+            item.concept.uuid === node.question.extras.questionOptions.concept)
         ) {
           found.push(item);
         }
diff --git a/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.spec.ts b/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.spec.ts
index 459fbc5b..a71381fa 100644
--- a/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.spec.ts
+++ b/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.spec.ts
@@ -14,111 +14,113 @@ import { DebugModeService } from '../services/debug-mode.service';
 import { PatientIdentifierAdapter } from './patient-identifier.adapter';
 
 const adultForm = require('../../adult.json');
-const mockLocationUuid = "some-location-uuid";
+const mockLocationUuid = 'some-location-uuid';
 describe('Patient identifier Value Adapter:', () => {
-    let adultFormSchema: any;
-    beforeEach(() => {
-        adultFormSchema = JSON.parse(JSON.stringify(adultForm));
-        TestBed.configureTestingModule({
-            imports: [TranslateModule.forRoot({
-                defaultLanguage: 'en',
-            })],
-            providers: [
-                FormFactory,
-                FormControlService,
-                ValidationFactory,
-                HidersDisablersFactory,
-                PatientIdentifierAdapter,
-                ExpressionRunner,
-                JsExpressionHelper,
-                AlertsFactory,
-                QuestionFactory,
-                ControlRelationsFactory,
-                DebugModeService
-            ]
-        });
+  let adultFormSchema: any;
+  beforeEach(() => {
+    adultFormSchema = JSON.parse(JSON.stringify(adultForm));
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          defaultLanguage: 'en'
+        })
+      ],
+      providers: [
+        FormFactory,
+        FormControlService,
+        ValidationFactory,
+        HidersDisablersFactory,
+        PatientIdentifierAdapter,
+        ExpressionRunner,
+        JsExpressionHelper,
+        AlertsFactory,
+        QuestionFactory,
+        ControlRelationsFactory,
+        DebugModeService
+      ]
     });
+  });
 
-    it('should be injectable', () => {
-        const adapter = TestBed.inject(PatientIdentifierAdapter);
-        const factory: FormFactory = TestBed.inject(FormFactory);
-        expect(adapter).toBeTruthy();
-        expect(factory).toBeTruthy();
-        expect(adultForm).toBeTruthy();
-        const createdForm = factory.createForm(adultFormSchema);
-        expect(createdForm).toBeTruthy();
-    });
-
-    it('should return all patient identifier nodes', () => {
-        const adapter = TestBed.inject(PatientIdentifierAdapter);
-        const factory: FormFactory = TestBed.inject(FormFactory);
-        const form = factory.createForm(adultFormSchema);
+  it('should be injectable', () => {
+    const adapter = TestBed.inject(PatientIdentifierAdapter);
+    const factory: FormFactory = TestBed.inject(FormFactory);
+    expect(adapter).toBeTruthy();
+    expect(factory).toBeTruthy();
+    expect(adultForm).toBeTruthy();
+    const createdForm = factory.createForm(adultFormSchema);
+    expect(createdForm).toBeTruthy();
+  });
 
-        const nodes: Array<NodeBase> = adapter.getPatientIdentifierNodes(
-            form.rootNode
-        );
-        expect(nodes.length).toBe(1);
-        expect(nodes[0].question.extras.questionOptions.identifierType).toBe(
-            'dfacd928-0370-4315-99d7-6ec1c9f7ae76'
-        );
-    });
+  it('should return all patient identifier nodes', () => {
+    const adapter = TestBed.inject(PatientIdentifierAdapter);
+    const factory: FormFactory = TestBed.inject(FormFactory);
+    const form = factory.createForm(adultFormSchema);
 
-    it('should generate patient identifier payload attachable to patient object', () => {
-        const adapter = TestBed.inject(PatientIdentifierAdapter);
-        const factory: FormFactory = TestBed.inject(FormFactory);
-        const form = factory.createForm(adultFormSchema);
+    const nodes: Array<NodeBase> = adapter.getPatientIdentifierNodes(
+      form.rootNode
+    );
+    expect(nodes.length).toBe(1);
+    expect(nodes[0].question.extras.questionOptions.identifierType).toBe(
+      'dfacd928-0370-4315-99d7-6ec1c9f7ae76'
+    );
+  });
 
-        const patientIdentifiers = {
-            "identifiers": [
-                {
-                    "uuid": "18d1571b-e4f6-47ec-8809-413248df8dc9",
-                    "identifier": "MGGE49",
-                    "identifierType": {
-                        "uuid": "dfacd928-0370-4315-99d7-6ec1c9f7ae76",
-                        "display": "OpenMRS ID"
-                    },
-                    "location": {
-                        "uuid": "6a74c45d-2b1e-431c-a15e-33b4d60c0c6c",
-                        "display": "10 Engineer VCT"
-                    }
-                },
-                {
-                    "uuid": "270a119d-73bc-43d3-8243-3593dfe4d1d1",
-                    "identifier": "0987654223",
-                    "identifierType": {
-                        "uuid": "05ee9cf4-7242-4a17-b4d4-00f707265c8a",
-                        "display": "Unique Patient Number"
-                    },
-                    "location": null
-                }
-            ]
-        };
+  it('should generate patient identifier payload attachable to patient object', () => {
+    const adapter = TestBed.inject(PatientIdentifierAdapter);
+    const factory: FormFactory = TestBed.inject(FormFactory);
+    const form = factory.createForm(adultFormSchema);
 
-        adapter.populateForm(form, patientIdentifiers.identifiers);
+    const patientIdentifiers = {
+      identifiers: [
+        {
+          uuid: '18d1571b-e4f6-47ec-8809-413248df8dc9',
+          identifier: 'MGGE49',
+          identifierType: {
+            uuid: 'dfacd928-0370-4315-99d7-6ec1c9f7ae76',
+            display: 'OpenMRS ID'
+          },
+          location: {
+            uuid: '6a74c45d-2b1e-431c-a15e-33b4d60c0c6c',
+            display: '10 Engineer VCT'
+          }
+        },
+        {
+          uuid: '270a119d-73bc-43d3-8243-3593dfe4d1d1',
+          identifier: '0987654223',
+          identifierType: {
+            uuid: '05ee9cf4-7242-4a17-b4d4-00f707265c8a',
+            display: 'Unique Patient Number'
+          },
+          location: null
+        }
+      ]
+    };
 
-        // simulate user input
+    adapter.populateForm(form, patientIdentifiers.identifiers);
 
-        const nodes: Array<NodeBase> = adapter.getPatientIdentifierNodes(
-            form.rootNode
-        );
+    // simulate user input
 
-        // generate payload
-        let payload = adapter.generateFormPayload(form, mockLocationUuid);
-        expect(payload.length).toBe(1);
-        expect(payload[0].patientIdentifier).toBe(
-          nodes[0].question.extras.questionOptions.patientIdentifier
-        );
-        expect(payload[0].identifierType).toBe('dfacd928-0370-4315-99d7-6ec1c9f7ae76');
-        expect(payload[0].identifier).toBe('MGGE49');
-        expect(payload[0].location).toBe(mockLocationUuid);
-        expect(payload[0].preferred).toBeFalse()
+    const nodes: Array<NodeBase> = adapter.getPatientIdentifierNodes(
+      form.rootNode
+    );
 
-        // more user input: no voiding of patient identifier check
-        nodes[0].control.setValue(null);
-
-        payload = adapter.generateFormPayload(form,mockLocationUuid);
-        expect(payload.length).toBe(0);
-    });
+    // generate payload
+    let payload = adapter.generateFormPayload(form, mockLocationUuid);
+    expect(payload.length).toBe(1);
+    expect(payload[0].patientIdentifier).toBe(
+      nodes[0].question.extras.questionOptions.patientIdentifier
+    );
+    expect(payload[0].identifierType).toBe(
+      'dfacd928-0370-4315-99d7-6ec1c9f7ae76'
+    );
+    expect(payload[0].identifier).toBe('MGGE49');
+    expect(payload[0].location).toBe(mockLocationUuid);
+    expect(payload[0].preferred).toBeFalse();
 
+    // more user input: no voiding of patient identifier check
+    nodes[0].control.setValue(null);
 
+    payload = adapter.generateFormPayload(form, mockLocationUuid);
+    expect(payload.length).toBe(0);
+  });
 });
diff --git a/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.ts b/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.ts
index f5d6e907..46db1c1a 100644
--- a/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.ts
+++ b/projects/ngx-formentry/src/form-entry/value-adapters/patient-identifier.adapter.ts
@@ -1,92 +1,91 @@
-import { Injectable } from "@angular/core";
-
-import { NodeBase, GroupNode, ArrayNode } from "../form-factory/form-node";
-import { Form } from "../form-factory";
+import { Injectable } from '@angular/core';
 
+import { NodeBase, GroupNode, ArrayNode } from '../form-factory/form-node';
+import { Form } from '../form-factory';
 
 @Injectable()
 export class PatientIdentifierAdapter {
-    generateFormPayload(form: Form, locationUuid: string) {
-        return this.generateNodePayload(form.rootNode, locationUuid);
-    }
+  generateFormPayload(form: Form, locationUuid: string) {
+    return this.generateNodePayload(form.rootNode, locationUuid);
+  }
 
-    generateNodePayload(rootNode: NodeBase, locationUuid: string) {
-        const nodes = this.getPatientIdentifierNodes(rootNode);
-        const payload = [];
-        nodes.forEach((node) => {
-            if (
-                node.control.value !== null &&
-                node.control.value !== undefined &&
-                node.control.value !== ''
-            ) {
-                payload.push({
-                    identifierType: node.question.extras.questionOptions.identifierType,
-                    identifier: node.control.value,
-                    location: locationUuid,
-                    preferred: false
-                });
-            }
+  generateNodePayload(rootNode: NodeBase, locationUuid: string) {
+    const nodes = this.getPatientIdentifierNodes(rootNode);
+    const payload = [];
+    nodes.forEach((node) => {
+      if (
+        node.control.value !== null &&
+        node.control.value !== undefined &&
+        node.control.value !== ''
+      ) {
+        payload.push({
+          identifierType: node.question.extras.questionOptions.identifierType,
+          identifier: node.control.value,
+          location: locationUuid,
+          preferred: false
         });
-        return payload;
-    }
-
-    populateForm(form: Form, payload) {
-        this.populateNode(form.rootNode, payload);
-    }
-
-    populateNode(rootNode: NodeBase, payload) {
-        if (!Array.isArray(payload)) {
-            throw new Error('Expected an array of patient identfiers');
-        }
+      }
+    });
+    return payload;
+  }
 
-        const nodes = this.getPatientIdentifierNodes(rootNode);
+  populateForm(form: Form, payload) {
+    this.populateNode(form.rootNode, payload);
+  }
 
-        nodes.forEach((node) => {
-            payload.forEach((element) => {
-                if (
-                    element.identifierType.uuid ===
-                    node.question.extras.questionOptions.identifierType
-                ) {
-                    if (element.identifier) {
-                        node.control.setValue(element.identifier);
-                        node.initialValue = element.identifier;
-                    }
-                }
-            });
-        });
+  populateNode(rootNode: NodeBase, payload) {
+    if (!Array.isArray(payload)) {
+      throw new Error('Expected an array of patient identfiers');
     }
 
-    getPatientIdentifierNodes(rootNode: NodeBase): Array<NodeBase> {
-        const results: Array<NodeBase> = [];
-        this.getPatientIdentifierTypeNodes(rootNode, results);
-        return results;
-    }
+    const nodes = this.getPatientIdentifierNodes(rootNode);
 
-    private getPatientIdentifierTypeNodes(
-        rootNode: NodeBase,
-        array: Array<NodeBase>
-    ) {
+    nodes.forEach((node) => {
+      payload.forEach((element) => {
         if (
-            rootNode.question.extras &&
-            rootNode.question.extras.type === 'patientIdentifier'
+          element.identifierType.uuid ===
+          node.question.extras.questionOptions.identifierType
         ) {
-            array.push(rootNode);
+          if (element.identifier) {
+            node.control.setValue(element.identifier);
+            node.initialValue = element.identifier;
+          }
         }
+      });
+    });
+  }
 
-        if (rootNode instanceof GroupNode) {
-            const node = rootNode as GroupNode;
-            for (const o in node.children) {
-                if (node.children[o] instanceof NodeBase) {
-                    this.getPatientIdentifierTypeNodes(node.children[o], array);
-                }
-            }
-        }
+  getPatientIdentifierNodes(rootNode: NodeBase): Array<NodeBase> {
+    const results: Array<NodeBase> = [];
+    this.getPatientIdentifierTypeNodes(rootNode, results);
+    return results;
+  }
+
+  private getPatientIdentifierTypeNodes(
+    rootNode: NodeBase,
+    array: Array<NodeBase>
+  ) {
+    if (
+      rootNode.question.extras &&
+      rootNode.question.extras.type === 'patientIdentifier'
+    ) {
+      array.push(rootNode);
+    }
 
-        if (rootNode instanceof ArrayNode) {
-            const node = rootNode as ArrayNode;
-            node.children.forEach((child) => {
-                this.getPatientIdentifierTypeNodes(child, array);
-            });
+    if (rootNode instanceof GroupNode) {
+      const node = rootNode as GroupNode;
+      for (const o in node.children) {
+        if (node.children[o] instanceof NodeBase) {
+          this.getPatientIdentifierTypeNodes(node.children[o], array);
         }
+      }
+    }
+
+    if (rootNode instanceof ArrayNode) {
+      const node = rootNode as ArrayNode;
+      node.children.forEach((child) => {
+        this.getPatientIdentifierTypeNodes(child, array);
+      });
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/projects/ngx-formentry/src/lib/index.ts b/projects/ngx-formentry/src/lib/index.ts
index a56148ab..395ff210 100644
--- a/projects/ngx-formentry/src/lib/index.ts
+++ b/projects/ngx-formentry/src/lib/index.ts
@@ -59,4 +59,4 @@ export { ErrorRendererComponent } from '../form-entry/error-renderer/error-rende
 export { DatePickerComponent } from '../components/date-time-picker';
 export { TimePickerComponent } from '../components/date-time-picker';
 export { MomentPipe } from '../components/date-time-picker';
-export { PatientIdentifierAdapter } from "../form-entry/value-adapters/patient-identifier.adapter"
+export { PatientIdentifierAdapter } from '../form-entry/value-adapters/patient-identifier.adapter';
diff --git a/projects/ngx-formentry/styles/ngx-formentry.css b/projects/ngx-formentry/styles/ngx-formentry.css
index 367d9306..d37093c3 100644
--- a/projects/ngx-formentry/styles/ngx-formentry.css
+++ b/projects/ngx-formentry/styles/ngx-formentry.css
@@ -221,7 +221,7 @@
 }
 
 .ng-select .ng-arrow-wrapper .ng-arrow::after {
-	content: url("data:image/svg+xml;charset=UTF-8, <svg  focusable='false' preserveAspectRatio='xMidYMid meet' xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16' aria-hidden='true' class='cds--select__arrow' style='will-change: transform;'><path  d='M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z'></path></svg>");
+  content: url("data:image/svg+xml;charset=UTF-8, <svg  focusable='false' preserveAspectRatio='xMidYMid meet' xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16' aria-hidden='true' class='cds--select__arrow' style='will-change: transform;'><path  d='M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z'></path></svg>");
 }
 
 .ng-select .ng-spinner-zone {
diff --git a/proxy.conf.json b/proxy.conf.json
index b3aaeb22..40ae1360 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -1,6 +1,6 @@
 {
-    "/lib": {
-      "target": "http://localhost:8000",
-      "secure": false
-    }
-  }
\ No newline at end of file
+  "/lib": {
+    "target": "http://localhost:8000",
+    "secure": false
+  }
+}
diff --git a/src/app/adult-1.4.json b/src/app/adult-1.4.json
index dd91dc74..329e0d04 100644
--- a/src/app/adult-1.4.json
+++ b/src/app/adult-1.4.json
@@ -86,7 +86,7 @@
       "componentConfigs": [
         {
           "tag": "afe-content-display",
-          "url":"http://localhost:4200/lib/web-components.bundled.js?module",
+          "url": "http://localhost:4200/lib/web-components.bundled.js?module",
           "module": "true",
           "detail": "This is custom component within a page it is displayed at the top of the page"
         }
@@ -98,7 +98,7 @@
           "componentConfigs": [
             {
               "tag": "afe-content-display",
-              "url":"http://localhost:4200/lib/web-components.bundled.js?module",
+              "url": "http://localhost:4200/lib/web-components.bundled.js?module",
               "module": "true",
               "detail": "This is custom component within a section it is displayed at the top of the section"
             }
@@ -111,7 +111,7 @@
               "componentConfigs": [
                 {
                   "tag": "afe-content-display",
-                  "url":"http://localhost:4200/lib/web-components.bundled.js?module",
+                  "url": "http://localhost:4200/lib/web-components.bundled.js?module",
                   "module": "true",
                   "detail": "This is custom component within a control it is displayed under the label"
                 }
@@ -168,7 +168,7 @@
               },
               "customControlConfig": {
                 "tag": "afe-content-switcher",
-                "url":"http://localhost:4200/lib/web-components.bundled.js?module",
+                "url": "http://localhost:4200/lib/web-components.bundled.js?module",
                 "module": "true"
               }
             },
@@ -194,7 +194,7 @@
               },
               "customControlConfig": {
                 "tag": "afe-content-display",
-                "url":"http://localhost:4200/lib/web-components.bundled.js?module",
+                "url": "http://localhost:4200/lib/web-components.bundled.js?module",
                 "module": "true"
               }
             }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index aeab98eb..d66fd27b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -14,7 +14,7 @@ import {
   EncounterAdapter,
   DataSources,
   FormErrorsService,
-  PersonAttribuAdapter,
+  PersonAttribuAdapter
 } from '@openmrs/ngx-formentry';
 import { MockObs } from './mock/mock-obs';
 import { mockTranslationsData } from './mock/mock-translations';
@@ -52,9 +52,8 @@ export class AppComponent implements OnInit {
     private formErrorsService: FormErrorsService,
     private http: HttpClient,
     private translate: TranslateService,
-    private personAttributeAdapter:PersonAttribuAdapter,
-    private patientIdenfierAdapter:PatientIdentifierAdapter
-
+    private personAttributeAdapter: PersonAttribuAdapter,
+    private patientIdenfierAdapter: PatientIdentifierAdapter
   ) {
     this.schema = adultForm;
   }
@@ -236,20 +235,21 @@ export class AppComponent implements OnInit {
       });
     });
 
-
     this.translate.currentLang = this.currentLanguage;
     this.fetchMockedTranslationsData().then((translationsData: any) => {
-      this.translate.setTranslation(translationsData?.language, translationsData?.translations);
+      this.translate.setTranslation(
+        translationsData?.language,
+        translationsData?.translations
+      );
     });
-
   }
 
-
-
   fetchMockedTranslationsData() {
     const promise = new Promise(function (resolve, reject) {
       setTimeout(function () {
-        const translationsData = mockTranslationsData.find(translation => translation.language === 'en')
+        const translationsData = mockTranslationsData.find(
+          (translation) => translation.language === 'en'
+        );
         resolve(translationsData);
       }, 2000);
     });
@@ -380,7 +380,7 @@ export class AppComponent implements OnInit {
       encounterUuid: 'encounterUuid',
       providerUuid: 'providerUuid',
       utcOffset: '+0300',
-      locationUuid:"some-location-uuid"
+      locationUuid: 'some-location-uuid'
     };
     if (this.form.valid) {
       this.form.showErrors = false;
@@ -392,10 +392,9 @@ export class AppComponent implements OnInit {
 
       // // generate orders payload
       // let ordersPayload = this.orderAdaptor.generateFormPayload(this.form);
-      
+
       // generate patient identifiers
       //const patientIdenfitiers = this.patientIdenfierAdapter.generateFormPayload(this.form,this.form.valueProcessingInfo['locationUuid']);
-
     } else {
       this.form.showErrors = true;
       this.form.markInvalidControls(this.form.rootNode);
diff --git a/src/app/mock/mock-translations.ts b/src/app/mock/mock-translations.ts
index 7c6577ef..57bc6624 100644
--- a/src/app/mock/mock-translations.ts
+++ b/src/app/mock/mock-translations.ts
@@ -1,76 +1,73 @@
 const frTranslations = {
-  "uuid": "510bb364-6928-42ea-9458-a46bfc2eebc6",
-  "language": "fr",
-  "translations": {
-    "Encounter Details": "Détails de la rencontre",
-    "Vitals": "signes vitaux",
-    "Test Results": "Résultats de test",
-    "Clinical History": "Histoire clinique",
-    "Pre-Clinic Review": "Examen pré-clinique",
-    "This is custom component within a page it is displayed at the top of the page":"Il s'agit d'un composant personnalisé dans une section, il est affiché en haut de la section",
-    "Custom Control Test": "Test de contrôle personnalisé",
-    "Current Symptoms": "Symptômes actuels",
-    "Assessment": "Évaluation",
-    "Medication Plan": "Régime de médicaments",
-    "Plan": "Planifier",
-    "Facility name (site/satellite clinic required)": "Nom de l'établissement (site/clinique satellite requis)",
-    "Visit date": "Date de visite",
-    "Provider": "Fournisseur"
+  uuid: '510bb364-6928-42ea-9458-a46bfc2eebc6',
+  language: 'fr',
+  translations: {
+    'Encounter Details': 'Détails de la rencontre',
+    Vitals: 'signes vitaux',
+    'Test Results': 'Résultats de test',
+    'Clinical History': 'Histoire clinique',
+    'Pre-Clinic Review': 'Examen pré-clinique',
+    'This is custom component within a page it is displayed at the top of the page':
+      "Il s'agit d'un composant personnalisé dans une section, il est affiché en haut de la section",
+    'Custom Control Test': 'Test de contrôle personnalisé',
+    'Current Symptoms': 'Symptômes actuels',
+    Assessment: 'Évaluation',
+    'Medication Plan': 'Régime de médicaments',
+    Plan: 'Planifier',
+    'Facility name (site/satellite clinic required)':
+      "Nom de l'établissement (site/clinique satellite requis)",
+    'Visit date': 'Date de visite',
+    Provider: 'Fournisseur'
   }
 };
 
 const kmTranslations = {
-  "uuid": "510bb364-6928-42ea-9458-a46bfc2eebc7",
-  "language": "km",
-  "translations": {
-    "Encounter Details": "ព័ត៌មានលម្អិតនៃការជួប",
-    "Pre-Clinic Review": "ការពិនិត្យឡើងវិញមុនគ្លីនិក",
-    "Clinical History": "ប្រវត្តិគ្លីនិក",
-    "Medication History": "ប្រវត្តិវេជ្ជសាស្ត្",
-    "Vitals": "វីតាល់",
-    "Test Results": "លទ្ធផល​តេ​ស្",
-    "This is custom component within a page it is displayed at the top of the page":"នេះគឺជាសមាសភាគផ្ទាល់ខ្លួននៅក្នុងផ្នែកដែលវាត្រូវបានបង្ហាញនៅផ្នែកខាងលើនៃផ្នែក",
-    "Custom Control Test": "ការធ្វើតេស្តត្រួតពិនិត្យផ្ទាល់ខ្លួន",
-    "Current Symptoms": "រោគសញ្ញាបច្ចុប្បន្ន",
-    "Assessment": "ការវាយតម្លៃ",
-    "Medication Plan": "ផែនការថ្នាំ",
-    "Plan": "ផែនការ",
-    "Facility name (site/satellite clinic required)": "ឈ្មោះកន្លែងប្រើប្រាស់ (ទាមទារកន្លែង/គ្លីនិកផ្កាយរណប)",
-    "Visit date": "កាលបរិច្ឆេទទស្សនា",
-    "Provider": "អ្នកផ្តល់សេវា"
+  uuid: '510bb364-6928-42ea-9458-a46bfc2eebc7',
+  language: 'km',
+  translations: {
+    'Encounter Details': 'ព័ត៌មានលម្អិតនៃការជួប',
+    'Pre-Clinic Review': 'ការពិនិត្យឡើងវិញមុនគ្លីនិក',
+    'Clinical History': 'ប្រវត្តិគ្លីនិក',
+    'Medication History': 'ប្រវត្តិវេជ្ជសាស្ត្',
+    Vitals: 'វីតាល់',
+    'Test Results': 'លទ្ធផល​តេ​ស្',
+    'This is custom component within a page it is displayed at the top of the page':
+      'នេះគឺជាសមាសភាគផ្ទាល់ខ្លួននៅក្នុងផ្នែកដែលវាត្រូវបានបង្ហាញនៅផ្នែកខាងលើនៃផ្នែក',
+    'Custom Control Test': 'ការធ្វើតេស្តត្រួតពិនិត្យផ្ទាល់ខ្លួន',
+    'Current Symptoms': 'រោគសញ្ញាបច្ចុប្បន្ន',
+    Assessment: 'ការវាយតម្លៃ',
+    'Medication Plan': 'ផែនការថ្នាំ',
+    Plan: 'ផែនការ',
+    'Facility name (site/satellite clinic required)':
+      'ឈ្មោះកន្លែងប្រើប្រាស់ (ទាមទារកន្លែង/គ្លីនិកផ្កាយរណប)',
+    'Visit date': 'កាលបរិច្ឆេទទស្សនា',
+    Provider: 'អ្នកផ្តល់សេវា'
   }
 };
 
 const esTranslations = {
-  "uuid": "510bb364-6928-42ea-9458-a46bfc2eebc8",
-  "language": "es",
-  "translations": {
-    "Encounter Details": "Detalles del encuentro",
-    "Test Results": "Resultados de la prueba",
-    "Vitals": "partes vitales",
-    "Clinical History": "Historial clinico",
-    "Pre-Clinic Review": "Revisión preclínica",
-    "This is custom component within a page it is displayed at the top of the page": "Este es un componente personalizado dentro de una sección que se muestra en la parte superior de la sección",
-    "Custom Control Test": "Prueba de control personalizado",
-    "Current Symptoms": "Síntomas actuales",
-    "Assessment": "Evaluación",
-    "Medication Plan": "Plan de medicamentos",
-    "Plan": "Plan",
-    "Facility name (site/satellite clinic required)": "Nombre del centro (sitio/clínica satélite requerida)",
-    "Visit date": "Fecha de visita",
-    "Provider": "Proveedor"
+  uuid: '510bb364-6928-42ea-9458-a46bfc2eebc8',
+  language: 'es',
+  translations: {
+    'Encounter Details': 'Detalles del encuentro',
+    'Test Results': 'Resultados de la prueba',
+    Vitals: 'partes vitales',
+    'Clinical History': 'Historial clinico',
+    'Pre-Clinic Review': 'Revisión preclínica',
+    'This is custom component within a page it is displayed at the top of the page':
+      'Este es un componente personalizado dentro de una sección que se muestra en la parte superior de la sección',
+    'Custom Control Test': 'Prueba de control personalizado',
+    'Current Symptoms': 'Síntomas actuales',
+    Assessment: 'Evaluación',
+    'Medication Plan': 'Plan de medicamentos',
+    Plan: 'Plan',
+    'Facility name (site/satellite clinic required)':
+      'Nombre del centro (sitio/clínica satélite requerida)',
+    'Visit date': 'Fecha de visita',
+    Provider: 'Proveedor'
   }
 };
 
-const mockTranslationsData = [
-  esTranslations,
-  kmTranslations,
-  frTranslations
-];
+const mockTranslationsData = [esTranslations, kmTranslations, frTranslations];
 
-export {
-  esTranslations,
-  kmTranslations,
-  frTranslations,
-  mockTranslationsData
-};
+export { esTranslations, kmTranslations, frTranslations, mockTranslationsData };
diff --git a/src/app/mock/obs.json b/src/app/mock/obs.json
index 332c669f..1686122c 100644
--- a/src/app/mock/obs.json
+++ b/src/app/mock/obs.json
@@ -438,7 +438,7 @@
         }
       ]
     },
-     {
+    {
       "uuid": "81dd8e5c-2a77-4296-ac7e-bb57ca3d9add",
       "obsDatetime": "2016-12-01T11:33:57.000+0300",
       "concept": {
@@ -458,8 +458,7 @@
         ]
       },
       "groupMembers": null,
-      "formFieldPath":"100.0"
-
+      "formFieldPath": "100.0"
     },
     {
       "uuid": "b4c90238-41d4-46a3-a557-16d8c3a8e42a",
@@ -541,7 +540,7 @@
     {
       "uuid": "7e5d7b85-075a-4d5e-aa0c-678196b40a18",
       "obsDatetime": "2016-12-01T11:33:57.000+0300",
-      "formFieldPath":"101.1",
+      "formFieldPath": "101.1",
       "concept": {
         "uuid": "a8a072c8-1350-11df-a1f1-0026b9348838",
         "name": {
@@ -2810,7 +2809,7 @@
             }
           ],
           "resourceVersion": "1.11"
-        },     
+        },
         {
           "uuid": "e8b92e69-49f4-47fa-98f1-f62bf01aeed8",
           "display": "NUMBER OF TABLETS PER DAY: 2.0",
@@ -3101,7 +3100,7 @@
           ],
           "resourceVersion": "1.11"
         },
-        
+
         {
           "uuid": "e8b92e69-49f4-47fa-98f1-f62bf01aeed8",
           "display": "NUMBER OF TABLETS PER DAY: 2.0",
@@ -3180,7 +3179,7 @@
         }
       ]
     },
-    
+
     {
       "uuid": "d240d15d-d60a-444c-8def-0de6e932f7d8",
       "obsDatetime": "2016-12-01T11:33:57.000+0300",
@@ -3201,7 +3200,7 @@
         ]
       },
       "groupMembers": null,
-      "formFieldPath":"100.1"
+      "formFieldPath": "100.1"
     },
     {
       "uuid": "425c71b9-8f10-4452-92f8-cd8d44c4a971",
@@ -3864,7 +3863,7 @@
         ]
       },
       "groupMembers": null,
-      "formFieldPath":"100.2"
+      "formFieldPath": "100.2"
     },
     {
       "uuid": "f86f7a3f-9883-4b9d-b2bf-7602e3c38ba8",
diff --git a/src/app/ncd-registration-1.0.json b/src/app/ncd-registration-1.0.json
index 9ff75fbd..45d69ec2 100644
--- a/src/app/ncd-registration-1.0.json
+++ b/src/app/ncd-registration-1.0.json
@@ -9,448 +9,448 @@
   "uuid": "xxxx",
   "referencedForms": [],
   "pages": [
-      {
+    {
+      "label": "General",
+      "sections": [
+        {
+          "isExpanded": "true",
           "label": "General",
-          "sections": [
-              {
-                  "isExpanded": "true",
-                  "label": "General",
-                  "questions": [
-                      {
-                          "id": "referralType",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "fd588078-9286-46ea-b133-36aab1b025ec",
-                              "answers": [
-                                  {
-                                      "concept": "37811074-14d1-41f3-bda9-e3422f6e22b0"
-                                  },
-                                  {
-                                      "concept": "989a3c74-141f-4dcf-9716-d4d3e2eaacdb"
-                                  }
-                              ],
-                              "allowUnselect": true
-                          },
-                          "type": "obs",
-                          "validators": []
-                      }
-                  ]
-              }
+          "questions": [
+            {
+              "id": "referralType",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "fd588078-9286-46ea-b133-36aab1b025ec",
+                "answers": [
+                  {
+                    "concept": "37811074-14d1-41f3-bda9-e3422f6e22b0"
+                  },
+                  {
+                    "concept": "989a3c74-141f-4dcf-9716-d4d3e2eaacdb"
+                  }
+                ],
+                "allowUnselect": true
+              },
+              "type": "obs",
+              "validators": []
+            }
           ]
-      },
-      {
+        }
+      ]
+    },
+    {
+      "label": "Past Medical History",
+      "sections": [
+        {
+          "isExpanded": "true",
           "label": "Past Medical History",
-          "sections": [
-              {
-                  "isExpanded": "true",
-                  "label": "Past Medical History",
-                  "questions": [
-                      {
-                          "id": "diagnosedForDM",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "7083941d-1342-4dd7-ba16-ddc78b61f239",
-                              "answers": [
-                                  {
-                                      "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  },
-                                  {
-                                      "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "prevDMdx",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "fe0b5b8e-c9a2-4c87-813d-f10884987d9c",
-                              "answers": [
-                                  {
-                                      "concept": "105903f4-7b6d-496a-b613-37ab9d0f5450"
-                                  },
-                                  {
-                                      "concept": "8b26ecd3-8726-4c8e-b042-cbe71e44a863"
-                                  },
-                                  {
-                                      "concept": "932d395c-d509-4d42-bac4-5a3281efe149"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "yearOfDx",
-                          "questionOptions": {
-                              "rendering": "date",
-                              "concept": "3fe4ac96-893f-4193-a896-1b7e9528719d"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "HighBloodPressureSx",
-                          "questionOptions": {
-                              "rendering": "textarea",
-                              "concept": "d3c8a8d4-c141-401f-8354-adbeda86011f",
-                              "rows": 5
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "currentTherapy",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "00808084-99a8-4ea8-98b4-63cae2a34273",
-                              "answers": [
-                                  {
-                                      "concept": "4aea53d6-88d1-4e4c-8702-a8142366af02"
-                                  },
-                                  {
-                                      "concept": "8c0fc1cc-f430-4201-968b-db0071b01dfd"
-                                  },
-                                  {
-                                      "concept": "d99b139e-4d8f-462c-9825-a0cdc0824417"
-                                  },
-                                  {
-                                      "concept": "c4c14717-6624-4963-b038-863eb51669a8"
-                                  },
-                                  {
-                                      "concept": "35eaca92-c94d-404c-aa06-1d366db4e8b9"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "traditionmedicineUse",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "5d65d35a-8ccc-474a-a2ce-746a518ed6f5",
-                              "answers": [
-                                  {
-                                      "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  },
-                                  {
-                                      "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "previousMedicalComplications",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "a9e26e21-126f-45ed-98f2-f4fb423bc634",
-                              "answers": [
-                                  {
-                                      "concept": "634f28c7-74c9-4b4e-b74d-6ac6a7a797ea"
-                                  },
-                                  {
-                                      "concept": "871389dc-a412-40ba-aa6d-d12497065ce0"
-                                  },
-                                  {
-                                      "concept": "63ab6543-78c9-4079-887a-8498a51bb98c"
-                                  },
-                                  {
-                                      "concept": "fcf078a5-a839-49d7-99cf-5427b0fbaad3"
-                                  },
-                                  {
-                                      "concept": "c64409ef-18fb-4e33-a187-e127243cb30c"
-                                  },
-                                  {
-                                      "concept": "11a2da88-7235-4182-b808-99ba2fb4a1a5"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "otherHealthComplications",
-                          "questionOptions": {
-                              "rendering": "textarea",
-                              "concept": "868e9ebe-86fd-467a-b7a8-345437f340af",
-                              "rows": 5
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "presenceOfAllergies",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "c67a6c5e-2559-46a8-b9da-2cb38bfff8a3",
-                              "answers": [
-                                  {
-                                      "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  },
-                                  {
-                                      "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "allergiesDetails",
-                          "questionOptions": {
-                              "rendering": "textarea",
-                              "concept": "b082eb80-3495-4af8-a970-0ae0af6ce184",
-                              "rows": 5
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "severityOfAllergies",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "436880a8-e47a-4fc1-9ad6-07fe543034c8",
-                              "answers": [
-                                  {
-                                      "concept": "cfb6f0f6-b5a8-433f-8e2d-70ef668e2094"
-                                  },
-                                  {
-                                      "concept": "8a72a904-5931-4780-9d6c-603215fa5e51"
-                                  },
-                                  {
-                                      "concept": "c6f4a5ac-75ff-45b2-b0a6-cc44d1c80499"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      }
-                  ]
-              }
+          "questions": [
+            {
+              "id": "diagnosedForDM",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "7083941d-1342-4dd7-ba16-ddc78b61f239",
+                "answers": [
+                  {
+                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  },
+                  {
+                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "prevDMdx",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "fe0b5b8e-c9a2-4c87-813d-f10884987d9c",
+                "answers": [
+                  {
+                    "concept": "105903f4-7b6d-496a-b613-37ab9d0f5450"
+                  },
+                  {
+                    "concept": "8b26ecd3-8726-4c8e-b042-cbe71e44a863"
+                  },
+                  {
+                    "concept": "932d395c-d509-4d42-bac4-5a3281efe149"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "yearOfDx",
+              "questionOptions": {
+                "rendering": "date",
+                "concept": "3fe4ac96-893f-4193-a896-1b7e9528719d"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "HighBloodPressureSx",
+              "questionOptions": {
+                "rendering": "textarea",
+                "concept": "d3c8a8d4-c141-401f-8354-adbeda86011f",
+                "rows": 5
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "currentTherapy",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "00808084-99a8-4ea8-98b4-63cae2a34273",
+                "answers": [
+                  {
+                    "concept": "4aea53d6-88d1-4e4c-8702-a8142366af02"
+                  },
+                  {
+                    "concept": "8c0fc1cc-f430-4201-968b-db0071b01dfd"
+                  },
+                  {
+                    "concept": "d99b139e-4d8f-462c-9825-a0cdc0824417"
+                  },
+                  {
+                    "concept": "c4c14717-6624-4963-b038-863eb51669a8"
+                  },
+                  {
+                    "concept": "35eaca92-c94d-404c-aa06-1d366db4e8b9"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "traditionmedicineUse",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "5d65d35a-8ccc-474a-a2ce-746a518ed6f5",
+                "answers": [
+                  {
+                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  },
+                  {
+                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "previousMedicalComplications",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "a9e26e21-126f-45ed-98f2-f4fb423bc634",
+                "answers": [
+                  {
+                    "concept": "634f28c7-74c9-4b4e-b74d-6ac6a7a797ea"
+                  },
+                  {
+                    "concept": "871389dc-a412-40ba-aa6d-d12497065ce0"
+                  },
+                  {
+                    "concept": "63ab6543-78c9-4079-887a-8498a51bb98c"
+                  },
+                  {
+                    "concept": "fcf078a5-a839-49d7-99cf-5427b0fbaad3"
+                  },
+                  {
+                    "concept": "c64409ef-18fb-4e33-a187-e127243cb30c"
+                  },
+                  {
+                    "concept": "11a2da88-7235-4182-b808-99ba2fb4a1a5"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "otherHealthComplications",
+              "questionOptions": {
+                "rendering": "textarea",
+                "concept": "868e9ebe-86fd-467a-b7a8-345437f340af",
+                "rows": 5
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "presenceOfAllergies",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "c67a6c5e-2559-46a8-b9da-2cb38bfff8a3",
+                "answers": [
+                  {
+                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  },
+                  {
+                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "allergiesDetails",
+              "questionOptions": {
+                "rendering": "textarea",
+                "concept": "b082eb80-3495-4af8-a970-0ae0af6ce184",
+                "rows": 5
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "severityOfAllergies",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "436880a8-e47a-4fc1-9ad6-07fe543034c8",
+                "answers": [
+                  {
+                    "concept": "cfb6f0f6-b5a8-433f-8e2d-70ef668e2094"
+                  },
+                  {
+                    "concept": "8a72a904-5931-4780-9d6c-603215fa5e51"
+                  },
+                  {
+                    "concept": "c6f4a5ac-75ff-45b2-b0a6-cc44d1c80499"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            }
           ]
-      },
-      {
+        }
+      ]
+    },
+    {
+      "label": "Life Style",
+      "sections": [
+        {
+          "isExpanded": "true",
           "label": "Life Style",
-          "sections": [
-              {
-                  "isExpanded": "true",
-                  "label": "Life Style",
-                  "questions": [
-                      {
-                          "id": "smoked",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "7533aa7e-04cb-4cfd-9c97-6ac36f114bab",
-                              "answers": [
-                                  {
-                                      "concept": "60bf95e1-04b5-48cf-8d05-3f5883a891e0"
-                                  },
-                                  {
-                                      "concept": "fd676d9a-1a47-4f6c-a24e-f57ac796b7f1"                                    },
-                                  {
-                                      "concept": "57ce8832-7ea7-45f9-91ba-09e1c064073b"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "exercise",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "c31a2da0-f16b-44e3-baea-8a259d8beb31",
-                              "answers": [
-                                  {
-                                      "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  },
-                                  {
-                                      "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "drinkAlcohol",
-                          "questionOptions": {
-                              "rendering": "radio",
-                              "concept": "e737c8c9-a154-47a1-aa20-ed13008d46cf",
-                              "answers": [
-                                  {
-                                      "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  },
-                                  {
-                                      "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-                                  }
-                              ]
-                          },
-                          "type": "obs",
-                          "validators": []
-                      }
-                  ]
-              }
+          "questions": [
+            {
+              "id": "smoked",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "7533aa7e-04cb-4cfd-9c97-6ac36f114bab",
+                "answers": [
+                  {
+                    "concept": "60bf95e1-04b5-48cf-8d05-3f5883a891e0"
+                  },
+                  {
+                    "concept": "fd676d9a-1a47-4f6c-a24e-f57ac796b7f1"
+                  },
+                  {
+                    "concept": "57ce8832-7ea7-45f9-91ba-09e1c064073b"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "exercise",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "c31a2da0-f16b-44e3-baea-8a259d8beb31",
+                "answers": [
+                  {
+                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  },
+                  {
+                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "drinkAlcohol",
+              "questionOptions": {
+                "rendering": "radio",
+                "concept": "e737c8c9-a154-47a1-aa20-ed13008d46cf",
+                "answers": [
+                  {
+                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  },
+                  {
+                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                  }
+                ]
+              },
+              "type": "obs",
+              "validators": []
+            }
           ]
-      },
-
+        }
+      ]
+    },
 
-      {
+    {
+      "label": "Vitals and Biometrics",
+      "sections": [
+        {
+          "isExpanded": "true",
           "label": "Vitals and Biometrics",
-          "sections": [
-              {
-                  "isExpanded": "true",
-                  "label": "Vitals and Biometrics",
-                  "questions": [
-                      {
-                          "id": "Ht",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                              "max": "272",
-                              "min": "10",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "Wt",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                              "max": "250",
-                              "min": "0",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "waistCircumference",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "90c9e0ae-d9f6-477c-9f23-bd7af88994e4",
-                              "max": "",
-                              "min": "",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "BMI",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "a89c60c0-1350-11df-a1f1-0026b9348838",
-                              "max": "",
-                              "min": "",
-                              "showDate": "false",
-                              "calculate": {
-                                  "calculateExpression": "calcBMI(Ht,Wt)"
-                                }
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "systole",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                              "max": "250",
-                              "min": "0",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "diastole",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                              "max": "150",
-                              "min": "0",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "pulse",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                              "max": "230",
-                              "min": "0",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "temp",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                              "max": "43",
-                              "min": "25",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      }
-                  ]
+          "questions": [
+            {
+              "id": "Ht",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "max": "272",
+                "min": "10",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "Wt",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "max": "250",
+                "min": "0",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "waistCircumference",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "90c9e0ae-d9f6-477c-9f23-bd7af88994e4",
+                "max": "",
+                "min": "",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "BMI",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "a89c60c0-1350-11df-a1f1-0026b9348838",
+                "max": "",
+                "min": "",
+                "showDate": "false",
+                "calculate": {
+                  "calculateExpression": "calcBMI(Ht,Wt)"
+                }
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "systole",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "max": "250",
+                "min": "0",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "diastole",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "max": "150",
+                "min": "0",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "pulse",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "max": "230",
+                "min": "0",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "temp",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "max": "43",
+                "min": "25",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            }
+          ]
+        },
+        {
+          "isExpanded": "true",
+          "label": "Blood sugar levels",
+          "questions": [
+            {
+              "id": "FBS",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "4a6ad2db-86af-4acc-906b-b749b7f6cda6",
+                "max": "600",
+                "min": "0",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "RBS",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "f52d731e-58da-4f3a-a480-77c5e9d8d2eb",
+                "max": "600",
+                "min": "0",
+                "showDate": "false"
+              },
+              "type": "obs",
+              "validators": []
+            },
+            {
+              "id": "HBA1c",
+              "questionOptions": {
+                "rendering": "number",
+                "concept": "a8af7520-1350-11df-a1f1-0026b9348838",
+                "max": "20",
+                "min": "0",
+                "showDate": "false"
               },
-              {
-                  "isExpanded": "true",
-                  "label": "Blood sugar levels",
-                  "questions": [
-                      {
-                          "id": "FBS",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "4a6ad2db-86af-4acc-906b-b749b7f6cda6",
-                              "max": "600",
-                              "min": "0",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "RBS",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "f52d731e-58da-4f3a-a480-77c5e9d8d2eb",
-                              "max": "600",
-                              "min": "0",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      },
-                      {
-                          "id": "HBA1c",
-                          "questionOptions": {
-                              "rendering": "number",
-                              "concept": "a8af7520-1350-11df-a1f1-0026b9348838",
-                              "max": "20",
-                              "min": "0",
-                              "showDate": "false"
-                          },
-                          "type": "obs",
-                          "validators": []
-                      }
-                  ]
-              }
+              "type": "obs",
+              "validators": []
+            }
           ]
-      }
+        }
+      ]
+    }
   ]
 }
diff --git a/src/app/translate/translate.module.ts b/src/app/translate/translate.module.ts
index f07ab5f6..b1ac089a 100644
--- a/src/app/translate/translate.module.ts
+++ b/src/app/translate/translate.module.ts
@@ -9,9 +9,9 @@ import { TranslateModule } from '@ngx-translate/core';
     CommonModule,
     HttpClientModule,
     TranslateModule.forRoot({
-      defaultLanguage: 'en',
-    }),
+      defaultLanguage: 'en'
+    })
   ],
-  exports: [TranslateModule],
+  exports: [TranslateModule]
 })
-export class NgxTranslateModule { }
+export class NgxTranslateModule {}
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index 40d4b677..e1a0469e 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -4,19 +4,10 @@
     "outDir": "../out-tsc/app",
     "types": ["node"]
   },
-  "files": [
-    "main.ts",
-    "polyfills.ts"
-  ],
+  "files": ["main.ts", "polyfills.ts"],
   "paths": {
-    "ngx-formentry": [
-      "projects/ngx-formentry"
-    ],
-    "ngx-formentry/*": [
-      "projects/ngx-formentry/*"
-    ]
+    "ngx-formentry": ["projects/ngx-formentry"],
+    "ngx-formentry/*": ["projects/ngx-formentry/*"]
   },
-  "include": [
-    "src/**/*.d.ts"
-  ]
+  "include": ["src/**/*.d.ts"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index d56922b3..0155669e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,20 +14,11 @@
     "resolveJsonModule": true,
     "importHelpers": true,
     "target": "es2015",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2018",
-      "dom"
-    ],
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2018", "dom"],
     "paths": {
-      "@openmrs/ngx-formentry": [
-        "projects/ngx-formentry/src/lib"
-      ],
-      "@openmrs/ngx-formentry/*": [
-        "projects/ngx-formentry/src/lib*"
-      ]
+      "@openmrs/ngx-formentry": ["projects/ngx-formentry/src/lib"],
+      "@openmrs/ngx-formentry/*": ["projects/ngx-formentry/src/lib*"]
     }
   },
   "angularCompilerOptions": {
@@ -35,4 +26,4 @@
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 75674b69..b86379db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4067,6 +4067,11 @@ escodegen@~1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-config-prettier@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f"
+  integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==
+
 eslint-scope@5.1.1, eslint-scope@^5.1.0, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"