Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion components/Questionnaire/EditorRendererSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ export default class EditorRendererSection extends Vue {
return;
}
console.log("Rendering response in CSIRO renderer", response);
await buildForm(questionnaire as QuestionnaireR4, response as QuestionnaireResponseR4);
await buildForm({
questionnaire: questionnaire as QuestionnaireR4,
questionnaireResponse: response as QuestionnaireResponseR4
});
}

public logResponse() {
Expand Down
6 changes: 4 additions & 2 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,13 @@ export default {
"openai",
"marked",
"antlr4",
/* Below are dependencies of CSIRO renderer */
"sql-on-fhir-v2",
/* Need to transpile CSIRO renderer and dependencies containing modern ES syntax (`?.`, `??`, etc.) */
"@aehrc/smart-forms-renderer",
"@mui",
"@emotion",
"@tanstack",
"sql-on-fhir-v2",
"uuid",
],
}
}
192 changes: 113 additions & 79 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"dockerize": "docker build -t fhirpath-lab ."
},
"dependencies": {
"@aehrc/sdc-populate": "^4.6.0",
"@aehrc/smart-forms-renderer": "^1.0.0-alpha.83",
"@aehrc/sdc-populate": "^4.6.2",
"@aehrc/smart-forms-renderer": "^1.2.8",
"@nuxtjs/applicationinsights": "^1.2.2",
"@types/ace": "^0.0.52",
"@types/fhir": "^0.0.41",
Expand Down
6 changes: 4 additions & 2 deletions pages/Questionnaire/tester.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,8 @@ export default Vue.extend({

if (this.$refs.csiroFormsRenderer && this.raw != null) {
let csiroFormsRenderer = (this.$refs.csiroFormsRenderer as EditorRendererSection)
await csiroFormsRenderer.renderQuestionnaireResponse(value, this.raw);
// Destructure to regular JS object before passing to renderer (Vue2). See https://vuejs.org/api/reactivity-advanced.html#toraw for Vue3 convention
await csiroFormsRenderer.renderQuestionnaireResponse(value, { ...this.raw });
}

if (this.$refs.lhcFormsRenderer && this.raw != null) {
Expand Down Expand Up @@ -1165,7 +1166,8 @@ export default Vue.extend({

if (this.$refs.csiroFormsRenderer && this.raw != null) {
let csiroFormsRenderer = (this.$refs.csiroFormsRenderer as EditorRendererSection)
await csiroFormsRenderer.renderQuestionnaireResponse(value, this.raw);
// Destructure to regular JS object before passing to renderer (Vue2). See https://vuejs.org/api/reactivity-advanced.html#toraw for Vue3 convention
await csiroFormsRenderer.renderQuestionnaireResponse(value, { ...this.raw });
}

if (this.$refs.lhcFormsRenderer && this.raw != null) {
Expand Down
Loading