Merge 09cc9c9 into 2acb479

opensrp · Aug 6, 2020 · 23a7120 · 23a7120
2 parents 2acb479 + 09cc9c9
commit 23a7120
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 94 deletions.
diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
@@ -41,6 +41,8 @@
 import com.vijay.jsonwizard.views.JsonFormFragmentView;
 import com.vijay.jsonwizard.viewstates.JsonFormFragmentViewState;
 
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.smartregister.simprint.SimPrintsLibrary;
@@ -225,6 +227,11 @@ public void setmJsonApi(JsonApi mJsonApi) {
     @Override
     public void onResume() {
         super.onResume();
+        if (!getJsonApi().isPreviousPressed()) {
+            skipStepsOnNextPressed();
+        } else {
+            skipStepOnPreviousPressed();
+        }
     }
 
     @Override
@@ -634,12 +641,14 @@ public void onClick(View view) {
             if (view != null) {
                 if (view.getId() == R.id.next_button) {
                     Object isSubmit = view.getTag(R.id.submit);
+                    getJsonApi().setPreviousPressed(false);
                     if (isSubmit != null && Boolean.valueOf(isSubmit.toString())) {
                         save(false);
                     } else {
                         next();
                     }
                 } else if (view.getId() == R.id.previous_button) {
+                    getJsonApi().setPreviousPressed(true);
                     getFragmentManager().popBackStack();
                 }
             }
@@ -660,4 +669,79 @@ public void setOnFieldsInvalid(OnFieldsInvalid onFieldsInvalid) {
     public static NativeFormsProperties getNativeFormProperties() {
         return nativeFormProperties;
     }
+
+    /**
+     * Skips blank by relevance steps when next is clicked on the json wizard forms.
+     */
+    public void skipStepsOnNextPressed() {
+        if (skipBlankSteps()) {
+            JSONObject formStep = getStep(getArguments().getString(JsonFormConstants.STEPNAME));
+            String next = formStep.optString(JsonFormConstants.NEXT, "");
+            if (StringUtils.isNotEmpty(next)) {
+                checkIfStepIsBlank(formStep);
+                if (shouldSkipStep()) {
+                    next();
+                }
+            }
+        }
+    }
+
+    /**
+     * Skips blank by relevance steps when previous is clicked on the json wizard forms.
+     */
+    public void skipStepOnPreviousPressed() {
+        if (skipBlankSteps()) {
+            JSONObject currentFormStep = getStep(getArguments().getString(JsonFormConstants.STEPNAME));
+            String next = currentFormStep.optString(JsonFormConstants.NEXT, "");
+            int currentFormStepNumber = getFormStepNumber(next);
+            for (int i = currentFormStepNumber; i >= 1; i--) {
+                JSONObject formStep = getJsonApi().getmJSONObject().optJSONObject(JsonFormConstants.STEP + i);
+                if (formStep != null) {
+                    checkIfStepIsBlank(formStep);
+                    if (shouldSkipStep()) {
+                        getFragmentManager().popBackStack();
+                    } else {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Checks if a given step is blank due to relevance hidding all the widgets
+     *
+     * @param formStep {@link JSONObject}
+     */
+    private void checkIfStepIsBlank(JSONObject formStep) {
+        try {
+            if (formStep.has(JsonFormConstants.FIELDS)) {
+                JSONArray fields = formStep.getJSONArray(JsonFormConstants.FIELDS);
+                for (int i = 0; i < fields.length(); i++) {
+                    JSONObject field = fields.getJSONObject(i);
+                    if (field.has(JsonFormConstants.TYPE) && !JsonFormConstants.HIDDEN.equals(field.getString(JsonFormConstants.TYPE))) {
+                        boolean isVisible = field.optBoolean(JsonFormConstants.IS_VISIBLE, true);
+                        if (isVisible) {
+                            setShouldSkipStep(false);
+                            break;
+                        }
+                    }
+                }
+            }
+        } catch (JSONException e) {
+            Timber.e(e, "%s --> checkIfStepIsBlank", this.getClass().getCanonicalName());
+        }
+    }
+
+    /**
+     * Returns the current form step number when given than steps next step number.
+     * This number is used to figure out which steps to pop when previous is clicked.
+     *
+     * @param nextFormNumber {@link String}
+     * @return formNumber {@link Integer}
+     */
+    private int getFormStepNumber(String nextFormNumber) {
+        return Integer.parseInt(getArguments().getString(JsonFormConstants.STEPNAME).substring(4));
+    }
 }
diff --git a/...json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java b/...json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java
@@ -27,11 +27,6 @@
 import com.vijay.jsonwizard.task.NextProgressDialogTask;
 import com.vijay.jsonwizard.viewstates.JsonFormFragmentViewState;
 
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import timber.log.Timber;
 
 /**
@@ -150,11 +145,6 @@ private Form getForm() {
     public void onResume() {
         super.onResume();
         setJsonFormFragment(this);
-        if (!getJsonApi().isPreviousPressed()) {
-            skipStepsOnNextPressed();
-        } else {
-            skipStepOnPreviousPressed();
-        }
     }
 
     @Override
@@ -263,89 +253,6 @@ public void updateVisibilityOfNextAndSave(boolean next, boolean save) {
         }
     }
 
-    /**
-     * Skips blank by relevance steps when next is clicked on the json wizard forms.
-     */
-    public void skipStepsOnNextPressed() {
-        if (skipBlankSteps()) {
-            JSONObject formStep = getStep(getArguments().getString(JsonFormConstants.STEPNAME));
-            String next = formStep.optString(JsonFormConstants.NEXT, "");
-            if (StringUtils.isNotEmpty(next)) {
-                checkIfStepIsBlank(formStep);
-                if (shouldSkipStep()) {
-                    next();
-                }
-            }
-        }
-    }
-
-    /**
-     * Skips blank by relevance steps when previous is clicked on the json wizard forms.
-     */
-    public void skipStepOnPreviousPressed() {
-        if (skipBlankSteps()) {
-            JSONObject currentFormStep = getStep(getArguments().getString(JsonFormConstants.STEPNAME));
-            String next = currentFormStep.optString(JsonFormConstants.NEXT, "");
-            int currentFormStepNumber = getFormStepNumber(next);
-            for (int i = currentFormStepNumber; i >= 1; i--) {
-                JSONObject formStep = getJsonApi().getmJSONObject().optJSONObject(JsonFormConstants.STEP + i);
-                if (formStep != null) {
-                    checkIfStepIsBlank(formStep);
-                    if (shouldSkipStep()) {
-                        getFragmentManager().popBackStack();
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks if a given step is blank due to relevance hidding all the widgets
-     *
-     * @param formStep {@link JSONObject}
-     */
-    private void checkIfStepIsBlank(JSONObject formStep) {
-        try {
-            if (formStep.has(JsonFormConstants.FIELDS)) {
-                JSONArray fields = formStep.getJSONArray(JsonFormConstants.FIELDS);
-                for (int i = 0; i < fields.length(); i++) {
-                    JSONObject field = fields.getJSONObject(i);
-                    if (field.has(JsonFormConstants.TYPE) && !JsonFormConstants.HIDDEN.equals(field.getString(JsonFormConstants.TYPE))) {
-                        boolean isVisible = field.optBoolean(JsonFormConstants.IS_VISIBLE, true);
-                        if (isVisible) {
-                            setShouldSkipStep(false);
-                            break;
-                        }
-                    }
-                }
-            }
-        } catch (JSONException e) {
-            Timber.e(e, "%s --> checkIfStepIsBlank", this.getClass().getCanonicalName());
-        }
-    }
-
-    /**
-     * Returns the current form step number when given than steps next step number.
-     * This number is used to figure out which steps to pop when previous is clicked.
-     *
-     * @param nextFormNumber {@link String}
-     * @return formNumber {@link Integer}
-     */
-    private int getFormStepNumber(String nextFormNumber) {
-        int formNumber = 0;
-        if (StringUtils.isNotBlank(nextFormNumber)) {
-            int currentFormNumber = Integer.parseInt(nextFormNumber.substring(4, 5)) - 1;
-            if (currentFormNumber > 0) {
-                formNumber = currentFormNumber;
-            } else if (currentFormNumber == 0) {
-                formNumber = 1;
-            }
-        }
-        return formNumber;
-    }
-
     protected void save() {
         try {
             Boolean skipValidation = ((JsonFormActivity) mMainView.getContext()).getIntent()

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.13.5-SNAPSHOT
+VERSION_NAME=1.14.0-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard