SL-618: handle additional inital values for registering a baby (#141)

* SL-618: handle additional initial values for registering a baby, and the ability to navigate directly to a given question.
openmrs · Jul 11, 2024 · 207592d · 207592d
1 parent a567365
commit 207592d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/...ava/org/openmrs/module/registrationapp/page/controller/RegisterPatientPageController.java b/...ava/org/openmrs/module/registrationapp/page/controller/RegisterPatientPageController.java
@@ -31,17 +31,18 @@ public void get(UiSessionContext sessionContext, PageModel model,
                     @RequestParam(value = "breadcrumbOverride", required = false) String breadcrumbOverride,
                     @RequestParam(value="returnUrl", required=false) String returnUrl,
                     @RequestParam(value = "initialValues", required = false)  String initialValues,
+                    @RequestParam(value = "goToSectionId", required = false)  String goToSectionId,
                     @RequestParam(value = "mother", required = false)  Patient mother,
                     @ModelAttribute("patient") @BindParams Patient patient,
                     @SpringBean("emrApiProperties") EmrApiProperties emrApiProperties,
                     @SpringBean("appFrameworkService") AppFrameworkService appFrameworkService,
                     UiUtils ui) throws Exception {
 
         sessionContext.requireAuthentication();
-        addModelAttributes(model, patient, app, emrApiProperties.getPrimaryIdentifierType(), breadcrumbOverride, returnUrl, initialValues, mother,appFrameworkService, sessionContext);
+        addModelAttributes(model, patient, app, emrApiProperties.getPrimaryIdentifierType(), breadcrumbOverride, returnUrl, initialValues, goToSectionId, mother,appFrameworkService, sessionContext);
     }
 
-    public void addModelAttributes(PageModel model, Patient patient, AppDescriptor app, PatientIdentifierType primaryIdentifierType, String breadcrumbOverride, String returnUrl, String initialValues, Patient mother, AppFrameworkService appFrameworkService, UiSessionContext sessionContext) throws Exception {
+    public void addModelAttributes(PageModel model, Patient patient, AppDescriptor app, PatientIdentifierType primaryIdentifierType, String breadcrumbOverride, String returnUrl, String initialValues, String goToSectionId, Patient mother, AppFrameworkService appFrameworkService, UiSessionContext sessionContext) throws Exception {
         NavigableFormStructure formStructure = RegisterPatientFormBuilder.buildFormStructure(app, app.getConfig().get("combineSections") != null ? app.getConfig().get("combineSections").getBooleanValue() : false,
                 appFrameworkService, sessionContext.generateAppContextModel());
 
@@ -72,6 +73,7 @@ public void addModelAttributes(PageModel model, Patient patient, AppDescriptor a
         model.addAttribute("breadcrumbOverride", breadcrumbOverride);
         model.addAttribute("returnUrl", returnUrl);
         model.addAttribute("initialFieldValues", initialValues);
+        model.addAttribute("goToSectionId", goToSectionId);
         model.addAttribute("mother", mother);
         model.addAttribute("relationshipTypes", Context.getPersonService().getAllRelationshipTypes());
 

diff --git a/omod/src/main/webapp/pages/registerPatient.gsp b/omod/src/main/webapp/pages/registerPatient.gsp
@@ -118,6 +118,7 @@ fieldset[id\$="-fieldset"] div > div {
 
     jq(document).ready(function() {
         if ('${initialFieldValues}') {
+            const registrationQuestions = new Set();
             let initialValues = JSON.parse('${initialFieldValues}');
             let fields = Object.keys(initialValues);
             if (fields) {
@@ -133,6 +134,7 @@ fieldset[id\$="-fieldset"] div > div {
                         //section.question.field
                         let fieldName = fieldProps[2];
                         let questionName = fieldProps[1];
+                        registrationQuestions.add(questionName);
                         jq('#' + questionName + ' input[name="' + fieldName + '"]').val(initialValues[field]);
                         if (NavigatorController.getQuestionById(questionName) != undefined) {
                             NavigatorController.getQuestionById(questionName).questionLi.addClass("done");
@@ -141,9 +143,32 @@ fieldset[id\$="-fieldset"] div > div {
                         if (fieldName == 'mother-field') {
                             // otherwise the field's change() event that gets trigger automatically would clear the initial values which we just set above
                             jq('#mother-field').autocomplete("option", "disabled", true);
+                        } else if (fieldName == 'gender') {
+                            // the gender field is a select list of options
+                            jq('#' + questionName + ' select[name="' + fieldName + '"] > option').each(function(){
+                                if (jq(this).text() == initialValues[field]) {
+                                    jq(this).prop('selected', true);
+                                }
+                            });
+                        } else if (fieldName == 'birthdateMonth') {
+                            // the birthdateMonth field is a dropdown list of months
+                            jq('#' + questionName + ' select[name="' + fieldName + '"]').val(initialValues[field]);
                         }
                     }
                 });
+                if (registrationQuestions.size > 0) {
+                    let formQuestions = NavigatorController.getQuestions();
+                    for (let index = 0; index < formQuestions.length; index++) {
+                        let questionId = formQuestions[index].id;
+                        if (registrationQuestions.has(questionId)) {
+                            NavigatorController.getQuestionById(questionId).click();
+                        }
+                    }
+                }
+            }
+            if ('${goToSectionId}') {
+                let sectionId = '${goToSectionId}';
+                NavigatorController.getQuestionById(sectionId).click();
             }
         }
     });