Merge branch 'main' into button

openmrs · Aug 15, 2023 · 144f3b6 · 144f3b6
2 parents c14c510 + a307698
commit 144f3b6
Show file tree

Hide file tree

Showing 25 changed files with 2,472 additions and 1,000 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: UCSF-IGHS/openmrs-esm-ohri
-          ref: working
+          ref: dev
 
       - name: Install dependencies
         run: yarn
@@ -137,7 +137,7 @@ jobs:
           title: "(chore) Bump `@openmrs/openmrs-form-engine-lib`"
           body: "This is an automated PR that bumps the [form engine library](https://github.com/openmrs/openmrs-form-engine-lib) to the newest available version tagged `next`."
           branch: chore/bump-form-engine
-          base: working
+          base: dev
 
   bump-form-engine_patient_chart:
     runs-on: ubuntu-latest
@@ -206,5 +206,5 @@ jobs:
           commit-message: "(chore) Bump `@openmrs/openmrs-form-engine-lib`"
           title: "(chore) Bump `@openmrs/openmrs-form-engine-lib`"
           body: "This is an automated PR that bumps the [form engine library](https://github.com/openmrs/openmrs-form-engine-lib) to the newest available version tagged `next`."
-          branch: chore/bump-form-engine  
+          branch: chore/bump-form-engine
           base: main
diff --git a/__mocks__/forms/ohri-forms/external_data_source_form.json b/__mocks__/forms/ohri-forms/external_data_source_form.json
@@ -14,16 +14,16 @@
 							"questionOptions": {
 								"rendering": "number",
 								"concept": "560555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                                "calculate": {
-                                    "calculateExpression": "resolve(api.getLatestObs('50512033-e047-4855-b2d3-1a6d9e889ff4', '560555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')).valueNumeric"
-                                },
+								"calculate": {
+									"calculateExpression": "resolve(api.getLatestObs('50512033-e047-4855-b2d3-1a6d9e889ff4', '560555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')).valueNumeric"
+								},
 								"conceptMappings": [
 									{
 										"type": "CIEL",
 										"value": "160555"
 									}
 								]
-                                
+
 							},
 							"id": "bodyWeight",
 							"validators": [],