From 36a550a37ffd71b7d236484e5ecf42a9525e18a9 Mon Sep 17 00:00:00 2001 From: zzainulabidin <62241922+zzainulabidin@users.noreply.github.com> Date: Wed, 24 Mar 2021 17:32:03 +0500 Subject: [PATCH 1/2] Update remove family and family member forms save title to string.xml --- .../chw/core/fragment/CoreFamilyRemoveMemberFragment.java | 2 +- .../chw/core/fragment/CoreIndividualProfileRemoveFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java index faa8b55c60..3f617cf160 100644 --- a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java +++ b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java @@ -131,7 +131,7 @@ public void startJsonActivity(JSONObject jsonObject) { Form form = new Form(); form.setActionBarBackground(R.color.family_actionbar); form.setWizard(false); - form.setSaveLabel("Save"); + form.setSaveLabel(getString(R.string.submit)); if (jsonObject.has(CoreConstants.REGISTER_TYPE.INDEPENDENT)) { form.setName(getString(R.string.remove_client)); } diff --git a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreIndividualProfileRemoveFragment.java b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreIndividualProfileRemoveFragment.java index 55f1465ae3..a0045f610d 100644 --- a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreIndividualProfileRemoveFragment.java +++ b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreIndividualProfileRemoveFragment.java @@ -157,7 +157,7 @@ public void startJsonActivity(JSONObject jsonObject) { Form form = new Form(); form.setActionBarBackground(R.color.family_actionbar); form.setWizard(false); - form.setSaveLabel("Save"); + form.setSaveLabel(getString(R.string.submit)); if (jsonObject.has(CoreConstants.REGISTER_TYPE.INDEPENDENT)) { form.setName(getString(R.string.remove_client)); } From 1ee9563c11bdc1b4426377f595da8bd6c3121c06 Mon Sep 17 00:00:00 2001 From: zzainulabidin <62241922+zzainulabidin@users.noreply.github.com> Date: Fri, 26 Mar 2021 17:23:00 +0500 Subject: [PATCH 2/2] empty commit --- .../chw/core/fragment/CoreFamilyRemoveMemberFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java index 3f617cf160..7173fd82e4 100644 --- a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java +++ b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/fragment/CoreFamilyRemoveMemberFragment.java @@ -136,7 +136,6 @@ public void startJsonActivity(JSONObject jsonObject) { form.setName(getString(R.string.remove_client)); } intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, form); - startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON); }