Merge pull request #63 from mcode/571-required-fields-fixes

Fix issues with checking required fields
mcode · Dec 13, 2023 · 79c92a0 · 79c92a0
2 parents 67c7acb + e76c973
commit 79c92a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/views/Questionnaire/QuestionnaireForm.tsx b/src/views/Questionnaire/QuestionnaireForm.tsx
@@ -145,7 +145,8 @@ export function QuestionnaireForm(props: QuestionnaireProps) {
     loadAndMergeForms(savedResponse);
     const formErrors = LForms.Util.checkValidity();
     setFormValidationErrors(formErrors == null ? [] : formErrors);
-    document.addEventListener('change', event => {
+
+    document.addEventListener('click', event => {
       if (
         props.filterChecked &&
         event.target instanceof Element &&

diff --git a/src/views/Questionnaire/SmartApp.tsx b/src/views/Questionnaire/SmartApp.tsx
@@ -348,7 +348,9 @@ export function SmartApp(props: SmartAppProps) {
   const updateRequired = (defaultFilter: boolean) => {
     let checked: boolean, requiredCheckbox: HTMLInputElement;
     if (!defaultFilter) {
-      requiredCheckbox = document.getElementById('required-fields-checkbox') as HTMLInputElement;
+      const requiredCheckbox = document.getElementById(
+        questionnaire ? `required-fields-checkbox-${questionnaire.id}` : 'required-fields-checkbox'
+      ) as HTMLInputElement;
       checked = requiredCheckbox ? requiredCheckbox.checked : false;
     } else {
       checked = true;