Merge remote-tracking branch 'origin/master'

Author: mogoodrich

api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderConstants.java

@@ -282,6 +282,7 @@ public static final class Extensions {
         public static final String PRINT_WRISTBAND_OVERALL_ACTION = "pih.wristband.print";
         public static final String PRINT_WRISTBAND_OVERALL_REGISTRATION_ACTION = "pih.registration.wristband.print";
         public static final String PATIENT_CHILDREN_OVERALL_ACTION = "pih.patient.children";
+        public static final String PATIENT_CHILDREN_OVERALL_REGISTRATION_ACTION = "pih.registration.patient.children";
         public static final String CREATE_VISIT_OVERALL_ACTION = "coreapps.createVisit";
         public static final String CREATE_HIV_VISIT_OVERALL_ACTION = "coreapps.hiv.createVisit";
         public static final String CREATE_RETROSPECTIVE_VISIT_OVERALL_ACTION = "coreapps.createRetrospectiveVisit";

api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderFactory.java

@@ -1421,14 +1421,22 @@ private void enableArchives() {
         addPaperRecordActionsIncludesIfNeeded();
     }
 
-    public void enableChildren() {
+    public void enableChildren() throws UnsupportedEncodingException {
         extensions.add(overallAction(CustomAppLoaderConstants.Extensions.PATIENT_CHILDREN_OVERALL_ACTION,
                 "registration.patient.children.label",
                 "fas fa-fw fa-child",
                 "link",
                 "pihcore/children/children.page?patientId={{patient.patientId}}&returnUrl=/" + WebConstants.CONTEXT_PATH + "/" + config.getDashboardUrl() ,
                 "App: registrationapp.registerPatient",
                 and(patientIsFemale(), patientIsReproductiveAge())));
+
+        extensions.add(overallRegistrationAction(CustomAppLoaderConstants.Extensions.PATIENT_CHILDREN_OVERALL_REGISTRATION_ACTION,
+                "registration.patient.children.label",
+                "fas fa-fw fa-child",
+                "link",
+                "pihcore/children/children.page?patientId={{patient.patientId}}&returnUrl=" + "/" + WebConstants.CONTEXT_PATH + "/registrationapp/registrationSummary.page?patientId={{patient.uuid}}" + URLEncoder.encode("&appId=registrationapp.registerPatient", "UTF-8") ,
+                "App: registrationapp.registerPatient",
+                and(patientIsFemale(), patientIsReproductiveAge())));
     }
     public void enableWristbands() {