From d0beddc484e3bb055fdb4ea09c7c7acef046fafe Mon Sep 17 00:00:00 2001
From: Jerry Padgett <sjpadgett@gmail.com>
Date: Tue, 25 Oct 2022 22:52:19 -0400
Subject: [PATCH] Missing form validation Questionnaires (#5868)

* Missing form validation Questionnaires
- add a dialog alert to show validation errors

* - format form error message alert
- prevent save form on save to registry
---
 .../questionnaire_assessments.php                  | 39 +++++++++++++++-------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/interface/forms/questionnaire_assessments/questionnaire_assessments.php b/interface/forms/questionnaire_assessments/questionnaire_assessments.php
index 8d93a7bf2..8742545c8 100644
--- a/interface/forms/questionnaire_assessments/questionnaire_assessments.php
+++ b/interface/forms/questionnaire_assessments/questionnaire_assessments.php
@@ -142,18 +142,33 @@ try {
             if (!isPortal) {
                 top.restoreSession();
             }
-            let qr = LForms.Util.getFormFHIRData('QuestionnaireResponse', 'R4');
+            if (formMode == 'register') {
+                return true;
+            }
             let formElement = document.getElementById("formContainer");
-            let data = LForms.Util.getUserData(formElement, false, true, true);
-            document.getElementById('lform_response').value = JSON.stringify(data);
-            document.getElementById('questionnaire_response').value = JSON.stringify(qr);
-            if (!document.getElementById('questionnaire').value) {
-                let lForm = JSON.parse(document.getElementById('lform').value);
-                let qFhir = LForms.Util.getFormFHIRData("Questionnaire", 'R4', data);
-                document.getElementById('questionnaire').value = JSON.stringify(qFhir);
+            let notValid = LForms.Util.checkValidity(formElement);
+            if (notValid) {
+                notValid = "<span class='font-weight-bold p-2'>" + jsText(notValid) + "</span>";
+                let error = notValid.replace(/requires a value,/g, "requires a value,<br />");
+                error = error.replace(/requires a value/g, "<span class='text-danger'>requires a value</span>")
+                let formatText = "<span class='h5'>" + xl('Form failed validation!') + "</span><br />" + error;
+                dialog.alert(formatText).then(returned => {
+                    dialog.close();
+                    return false;
+                });
+            } else {
+                let qr = LForms.Util.getFormFHIRData('QuestionnaireResponse', 'R4');
+                let data = LForms.Util.getUserData(formElement, false, true, true);
+                document.getElementById('lform_response').value = JSON.stringify(data);
+                document.getElementById('questionnaire_response').value = JSON.stringify(qr);
+                if (!document.getElementById('questionnaire').value) {
+                    let lForm = JSON.parse(document.getElementById('lform').value);
+                    let qFhir = LForms.Util.getFormFHIRData("Questionnaire", 'R4', data);
+                    document.getElementById('questionnaire').value = JSON.stringify(qFhir);
+                }
+                return true;
             }
-
-            return true;
+            return false;
         }
 
         function initUpdate() {
@@ -382,7 +397,7 @@ try {
             <?php if (!$isPortal && !$patientPortalOther) { ?>
                 <div class="btn-group my-2">
                     <button type="submit" class="btn btn-primary btn-save isNew" id="save_response" title="<?php echo xla('Save current form or create a new one time questionnaire for this encounter if this is a New Questionnaire form.'); ?>"><?php echo xlt("Save Current"); ?></button>
-                    <button type="submit" class="btn btn-primary d-none" id="save_registry" name="save_registry" title="<?php echo xla('Register as a new encounter form for reuse in any encounter.'); ?>"><?php echo xlt("or Register New"); ?></button>
+                    <button type="submit" class="btn btn-primary d-none" id="save_registry" name="save_registry" title="<?php echo xla('Register as a new encounter form for reuse in any encounter.'); ?>" onclick="formMode = 'register'"><?php echo xlt("or Register New"); ?></button>
                     <button type='button' class="btn btn-secondary btn-cancel" onclick="parent.closeTab(window.name, false)"><?php echo xlt('Cancel'); ?></button>
                 </div>
             <?php } ?>
@@ -399,7 +414,7 @@ try {
     <!-- TODO Temporary dependencies location -->
     <?php require(__DIR__ . "/../../forms/questionnaire_assessments/lform_webcomponents.php") ?>
     <!-- Dependency scopes seem strange using the way we have to implement the necessary web components. -->
-    <?php Header::setupAssets(['select2']); ?>
+    <?php Header::setupAssets(['select2', 'bootstrap']); ?>
     <script>
         <?php if ($isPortal || $patientPortalOther) { ?>
         $(function () {
-- 
2.11.4.GIT