From f3a49e5bd4464efdeddc6a61448885c3eb825576 Mon Sep 17 00:00:00 2001 From: Brian Postlethwaite Date: Thu, 19 Sep 2024 20:09:38 +1000 Subject: [PATCH] lforms editor update --- changelog.md | 3 +++ components/QuestionnaireExtractTest.vue | 2 +- package-lock.json | 22 +++++++++++----------- package.json | 2 +- pages/Questionnaire/tester.vue | 6 ++++-- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/changelog.md b/changelog.md index ddc62c6..41e765c 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,9 @@ > **Note:** The dates included here are the dates of the commits that were made to the repository. The actual release dates may be different. +## 19 September 2024 (dev) +* Update the CSIRO renderer to v0.40.1 + ## 18 September 2024 (dev) * Update the CSIRO renderer to v0.40.0 * Enhance the POC $extract Questionnaire tester based on initial testing diff --git a/components/QuestionnaireExtractTest.vue b/components/QuestionnaireExtractTest.vue index b6b6221..58d474c 100644 --- a/components/QuestionnaireExtractTest.vue +++ b/components/QuestionnaireExtractTest.vue @@ -156,7 +156,7 @@ export default class QuestionnaireExtractTest extends Vue { this.extractingInProgress = false; } - @Watch('questionnaireResponse', { immediate: false, deep: true }) + @Watch('questionnaireResponse', { immediate: true, deep: false }) async onQuestionnaireResponseChanged() { console.log("QR changed"); } diff --git a/package-lock.json b/package-lock.json index 471df9f..78227ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "BSD-3-Clause", "dependencies": { "@aehrc/sdc-populate": "^2.3.1", - "@aehrc/smart-forms-renderer": "^0.40.0", + "@aehrc/smart-forms-renderer": "^0.40.1", "@nuxtjs/applicationinsights": "^1.2.2", "@types/ace": "^0.0.52", "@types/fhir": "^0.0.41", @@ -103,9 +103,9 @@ } }, "node_modules/@aehrc/smart-forms-renderer": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.40.0.tgz", - "integrity": "sha512-BolsujEgIDDa0LlLOxZRFzikmsHm6yoh0a25ckQwpI/nrcPoirfRglqXJTkGMD4bFmwZLYrkuxiD1nNMXGXofw==", + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.40.1.tgz", + "integrity": "sha512-Y6AaGHCl+YP+Z8WOdsknXOAHTuW0PKWaoaZDlcazOIGfc0k17yfhkqnA+M0ycfkRUo+XJhY7A2WAHFZz1oW0pg==", "dependencies": { "@aehrc/sdc-populate": "^2.3.1", "@iconify/react": "^4.1.1", @@ -30915,9 +30915,9 @@ } }, "@aehrc/smart-forms-renderer": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.40.0.tgz", - "integrity": "sha512-BolsujEgIDDa0LlLOxZRFzikmsHm6yoh0a25ckQwpI/nrcPoirfRglqXJTkGMD4bFmwZLYrkuxiD1nNMXGXofw==", + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.40.1.tgz", + "integrity": "sha512-Y6AaGHCl+YP+Z8WOdsknXOAHTuW0PKWaoaZDlcazOIGfc0k17yfhkqnA+M0ycfkRUo+XJhY7A2WAHFZz1oW0pg==", "requires": { "@aehrc/sdc-populate": "^2.3.1", "@iconify/react": "^4.1.1", @@ -42056,7 +42056,7 @@ "version": "file:", "requires": { "@aehrc/sdc-populate": "^2.3.1", - "@aehrc/smart-forms-renderer": "^0.40.0", + "@aehrc/smart-forms-renderer": "^0.40.1", "@mdi/font": "^6.5.95", "@mdi/js": "^6.5.95", "@nuxt/types": "^2.15.7", @@ -42138,9 +42138,9 @@ } }, "@aehrc/smart-forms-renderer": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.40.0.tgz", - "integrity": "sha512-BolsujEgIDDa0LlLOxZRFzikmsHm6yoh0a25ckQwpI/nrcPoirfRglqXJTkGMD4bFmwZLYrkuxiD1nNMXGXofw==", + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.40.1.tgz", + "integrity": "sha512-Y6AaGHCl+YP+Z8WOdsknXOAHTuW0PKWaoaZDlcazOIGfc0k17yfhkqnA+M0ycfkRUo+XJhY7A2WAHFZz1oW0pg==", "requires": { "@aehrc/sdc-populate": "^2.3.1", "@iconify/react": "^4.1.1", diff --git a/package.json b/package.json index 5216a87..481a837 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@aehrc/sdc-populate": "^2.3.1", - "@aehrc/smart-forms-renderer": "^0.40.0", + "@aehrc/smart-forms-renderer": "^0.40.1", "@nuxtjs/applicationinsights": "^1.2.2", "@types/ace": "^0.0.52", "@types/fhir": "^0.0.41", diff --git a/pages/Questionnaire/tester.vue b/pages/Questionnaire/tester.vue index f5e4946..1d6ff84 100644 --- a/pages/Questionnaire/tester.vue +++ b/pages/Questionnaire/tester.vue @@ -926,9 +926,11 @@ export default Vue.extend({ }, async processUpdatedQuestionnaireResponse(value: fhir4b.QuestionnaireResponse) { if (this.questionnaireResponseJsonEditor) { - this.questionnaireResponse = value; + const jsonValue = JSON.stringify(value, null, 2); + this.questionnaireResponse = JSON.parse(jsonValue); + // console.log("Updated QuestionnaireResponse: ", this.questionnaireResponse); this.questionnaireResponseJsonEditor.setValue( - JSON.stringify(this.questionnaireResponse, null, 2) + jsonValue ); this.questionnaireResponseJsonEditor.clearSelection(); this.selectTab(10);