From e47eaa36528f99399ac284abab4a7bcc7ac4376a Mon Sep 17 00:00:00 2001 From: Allan O Date: Fri, 9 Oct 2020 16:59:17 +0300 Subject: [PATCH 1/3] :arrow_up: Update client-core,config-views dependencies --- opensrp-child/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensrp-child/build.gradle b/opensrp-child/build.gradle index e3ebee6ae..1e3fab1c2 100644 --- a/opensrp-child/build.gradle +++ b/opensrp-child/build.gradle @@ -88,7 +88,7 @@ allprojects { dependencies { - api('org.smartregister:opensrp-client-core:2.1.4-SNAPSHOT@aar') { + api('org.smartregister:opensrp-client-core:2.1.2.2-SNAPSHOT@aar') { transitive = true exclude group: 'com.github.bmelnychuk', module: 'atv' exclude group: 'com.google.guava', module: 'guava' @@ -114,7 +114,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.6' - api('org.smartregister:opensrp-client-configurable-views:1.1.5-SNAPSHOT@aar') { + api('org.smartregister:opensrp-client-configurable-views:1.1.5.1-SNAPSHOT@aar') { transitive = true exclude group: 'org.smartregister', module: 'opensrp-client-core' exclude group: 'org.smartregister', module: 'opensrp-client-native-form' From 0b61a56ca45b23e40d2293f18db0975b897d1b12 Mon Sep 17 00:00:00 2001 From: Allan O Date: Fri, 9 Oct 2020 16:59:41 +0300 Subject: [PATCH 2/3] :camera_flash: Update client-child snapshot --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bcbf1e234..0b08878ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.5.0-SNAPSHOT +VERSION_NAME=0.6.0-SNAPSHOT VERSION_CODE=1 GROUP=org.smartregister POM_SETTING_DESCRIPTION=OpenSRP Client Child Library From 3f4651894b4231f1a339f22d30b2860b535ddce8 Mon Sep 17 00:00:00 2001 From: Allan O Date: Fri, 9 Oct 2020 17:00:23 +0300 Subject: [PATCH 3/3] :recycle: Refactor Register implementation Refactor Activities, Presenters, Models, Fragments & Contracts --- .../child/contract/ChildRegisterContract.java | 2 +- .../contract/ChildRegisterFragmentContract.java | 12 +----------- .../fragment/BaseAdvancedSearchFragment.java | 3 ++- .../fragment/BaseChildRegisterFragment.java | 3 ++- .../model/BaseChildRegisterFragmentModel.java | 9 +++++---- .../BaseChildRegisterFragmentPresenter.java | 11 +++++++---- .../presenter/BaseChildRegisterPresenter.java | 8 ++++++-- .../child/sample/model/AdvancedSearchModel.java | 16 ++++++++++++++++ .../sample/model/ChildRegisterFragmentModel.java | 15 +++++++++++++++ 9 files changed, 55 insertions(+), 24 deletions(-) diff --git a/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterContract.java b/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterContract.java index 0db9f3b0b..effaaea8e 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterContract.java +++ b/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterContract.java @@ -26,7 +26,7 @@ interface Presenter extends BaseRegisterContract.Presenter { void saveLanguage(String language); - void startForm(String formName, String entityId, String metadata, String currentLocationId) throws Exception; + void startForm(String formName, String entityId, String metadata, String currentLocationId); void startForm(String formName, String entityId, Map metadata, String currentLocationId) throws Exception; diff --git a/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterFragmentContract.java b/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterFragmentContract.java index 6acb97773..42590672d 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterFragmentContract.java +++ b/opensrp-child/src/main/java/org/smartregister/child/contract/ChildRegisterFragmentContract.java @@ -19,8 +19,6 @@ public interface ChildRegisterFragmentContract { interface View extends BaseRegisterFragmentContract.View { - void initializeAdapter(Set visibleColumns); - void recalculatePagination(AdvancedMatrixCursor matrixCursor); ChildRegisterFragmentContract.Presenter presenter(); @@ -29,28 +27,20 @@ interface View extends BaseRegisterFragmentContract.View { interface Presenter extends BaseRegisterFragmentContract.Presenter { - void updateSortAndFilter(List filterList, Field sortField); - String getMainCondition(); String getDefaultSortQuery(); } - interface Model { + interface Model extends BaseRegisterFragmentContract.Model{ RegisterConfiguration defaultRegisterConfiguration(); - ViewConfiguration getViewConfiguration(String viewConfigurationIdentifier); - - Set getRegisterActiveColumns(String viewConfigurationIdentifier); - String countSelect(String mainCondition); String mainSelect(String mainCondition); - String getFilterText(List filterList, String filter); - String getSortText(Field sortField); AdvancedMatrixCursor createMatrixCursor(Response response); diff --git a/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseAdvancedSearchFragment.java b/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseAdvancedSearchFragment.java index 935b3ee1f..b4f3d405e 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseAdvancedSearchFragment.java +++ b/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseAdvancedSearchFragment.java @@ -57,6 +57,7 @@ import org.smartregister.immunization.ImmunizationLibrary; import org.smartregister.view.activity.BaseRegisterActivity; import org.smartregister.view.activity.SecuredNativeSmartRegisterActivity; +import org.smartregister.view.contract.IView; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -274,7 +275,7 @@ public void setupViews(View view) { public abstract void populateSearchableFields(View view); @Override - public void initializeAdapter(Set visibleColumns) { + public void initializeAdapter(Set visibleColumns) { RepositoryHolder repoHolder = new RepositoryHolder(); diff --git a/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseChildRegisterFragment.java b/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseChildRegisterFragment.java index f89d9c64a..ee7288d61 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseChildRegisterFragment.java +++ b/opensrp-child/src/main/java/org/smartregister/child/fragment/BaseChildRegisterFragment.java @@ -38,6 +38,7 @@ import org.smartregister.receiver.SyncStatusBroadcastReceiver; import org.smartregister.view.LocationPickerView; import org.smartregister.view.activity.BaseRegisterActivity; +import org.smartregister.view.contract.IView; import org.smartregister.view.customcontrols.CustomFontTextView; import org.smartregister.view.fragment.BaseRegisterFragment; @@ -291,7 +292,7 @@ public void showNotFoundPopup(String opensrpID) { } @Override - public void initializeAdapter(Set visibleColumns) { + public void initializeAdapter(Set visibleColumns) { RepositoryHolder repositoryHolder = new RepositoryHolder(); repositoryHolder.setCommonRepository(commonRepository()); repositoryHolder.setVaccineRepository(ImmunizationLibrary.getInstance().vaccineRepository()); diff --git a/opensrp-child/src/main/java/org/smartregister/child/model/BaseChildRegisterFragmentModel.java b/opensrp-child/src/main/java/org/smartregister/child/model/BaseChildRegisterFragmentModel.java index 64204963f..120664907 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/model/BaseChildRegisterFragmentModel.java +++ b/opensrp-child/src/main/java/org/smartregister/child/model/BaseChildRegisterFragmentModel.java @@ -11,10 +11,11 @@ import org.smartregister.configurableviews.ConfigurableViewsLibrary; import org.smartregister.configurableviews.model.Field; import org.smartregister.configurableviews.model.RegisterConfiguration; -import org.smartregister.configurableviews.model.View; import org.smartregister.configurableviews.model.ViewConfiguration; import org.smartregister.domain.Response; import org.smartregister.domain.ResponseStatus; +import org.smartregister.view.contract.IField; +import org.smartregister.view.contract.IView; import java.util.ArrayList; import java.util.List; @@ -38,7 +39,7 @@ public ViewConfiguration getViewConfiguration(String viewConfigurationIdentifier } @Override - public Set getRegisterActiveColumns(String viewConfigurationIdentifier) { + public Set getRegisterActiveColumns(String viewConfigurationIdentifier) { return ConfigurableViewsLibrary.getInstance().getConfigurableViewsHelper().getRegisterActiveColumns(viewConfigurationIdentifier); } @@ -53,8 +54,8 @@ public String mainSelect(String mainCondition) { } @Override - public String getFilterText(List list, String filterTitle) { - List filterList = list; + public String getFilterText(List list, String filterTitle) { + List filterList = list; if (filterList == null) { filterList = new ArrayList<>(); } diff --git a/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterFragmentPresenter.java b/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterFragmentPresenter.java index af8c2d30b..420cecbca 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterFragmentPresenter.java +++ b/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterFragmentPresenter.java @@ -9,6 +9,9 @@ import org.smartregister.configurableviews.model.Field; import org.smartregister.configurableviews.model.RegisterConfiguration; import org.smartregister.configurableviews.model.ViewConfiguration; +import org.smartregister.view.contract.IField; +import org.smartregister.view.contract.IView; +import org.smartregister.view.contract.IViewConfiguration; import java.lang.ref.WeakReference; import java.util.List; @@ -26,7 +29,7 @@ public abstract class BaseChildRegisterFragmentPresenter implements ChildRegiste protected RegisterConfiguration config; - protected Set visibleColumns = new TreeSet<>(); + protected Set visibleColumns = new TreeSet<>(); protected String viewConfigurationIdentifier; @@ -49,7 +52,7 @@ public void processViewConfigurations() { return; } - ViewConfiguration viewConfiguration = model.getViewConfiguration(viewConfigurationIdentifier); + IViewConfiguration viewConfiguration = model.getViewConfiguration(viewConfigurationIdentifier); if (viewConfiguration != null) { config = (RegisterConfiguration) viewConfiguration.getMetadata(); setVisibleColumns(model.getRegisterActiveColumns(viewConfigurationIdentifier)); @@ -84,7 +87,7 @@ public void searchGlobally(String uniqueId) { // TODO implement search global } - private void setVisibleColumns(Set visibleColumns) { + private void setVisibleColumns(Set visibleColumns) { this.visibleColumns = visibleColumns; } @@ -94,7 +97,7 @@ protected ChildRegisterFragmentContract.View getView() { } @Override - public void updateSortAndFilter(List filterList, Field sortField) { + public void updateSortAndFilter(List filterList, IField sortField) { String filterText = model.getFilterText(filterList, getView().getString(R.string.filter)); String sortText = model.getSortText(sortField); diff --git a/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterPresenter.java b/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterPresenter.java index 7ac5e5ff5..1d32548cb 100644 --- a/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterPresenter.java +++ b/opensrp-child/src/main/java/org/smartregister/child/presenter/BaseChildRegisterPresenter.java @@ -95,12 +95,16 @@ public void saveLanguage(String language) { } @Override - public void startForm(String formName, String entityId, String metadata, String currentLocationId) throws Exception { + public void startForm(String formName, String entityId, String metadata, String currentLocationId) { Map metadataMap = StringUtils.isBlank(metadata) ? new HashMap() : (Map) new Gson() .fromJson(metadata, new TypeToken>() { }.getType()); - startForm(formName, entityId, metadataMap, currentLocationId); + try { + startForm(formName, entityId, metadataMap, currentLocationId); + } catch (Exception e) { + Timber.e(e); + } } @Override diff --git a/sample/src/main/java/org/smartregister/child/sample/model/AdvancedSearchModel.java b/sample/src/main/java/org/smartregister/child/sample/model/AdvancedSearchModel.java index 317aa5326..9fcede221 100644 --- a/sample/src/main/java/org/smartregister/child/sample/model/AdvancedSearchModel.java +++ b/sample/src/main/java/org/smartregister/child/sample/model/AdvancedSearchModel.java @@ -12,6 +12,7 @@ import org.smartregister.child.util.Utils; import org.smartregister.clientandeventmodel.DateUtil; import org.smartregister.domain.Response; +import org.smartregister.view.contract.IField; import java.util.ArrayList; import java.util.Collections; @@ -176,4 +177,19 @@ private Date processJsonFormatLocalDate(String dateString) { } return date; } + + @Override + public String countSelect(String s, String s1) { + return null; + } + + @Override + public String mainSelect(String s, String s1) { + return null; + } + + @Override + public String getSortText(IField iField) { + return null; + } } diff --git a/sample/src/main/java/org/smartregister/child/sample/model/ChildRegisterFragmentModel.java b/sample/src/main/java/org/smartregister/child/sample/model/ChildRegisterFragmentModel.java index 521598d71..3f5b59ff4 100644 --- a/sample/src/main/java/org/smartregister/child/sample/model/ChildRegisterFragmentModel.java +++ b/sample/src/main/java/org/smartregister/child/sample/model/ChildRegisterFragmentModel.java @@ -3,6 +3,7 @@ import org.smartregister.child.cursor.AdvancedMatrixCursor; import org.smartregister.child.model.BaseChildRegisterFragmentModel; import org.smartregister.domain.Response; +import org.smartregister.view.contract.IField; /** * Created by ndegwamartin on 2019-05-27. @@ -15,4 +16,18 @@ public AdvancedMatrixCursor createMatrixCursor(Response response) { return null; } + @Override + public String countSelect(String s, String s1) { + return null; + } + + @Override + public String mainSelect(String s, String s1) { + return null; + } + + @Override + public String getSortText(IField iField) { + return null; + } }