Update Child Register implementation

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

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'

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<String, String> metadata, String currentLocationId) throws Exception;
 

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<org.smartregister.configurableviews.model.View> 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<Field> filterList, Field sortField);
-
         String getMainCondition();
 
         String getDefaultSortQuery();
 
     }
 
-    interface Model {
+    interface Model extends BaseRegisterFragmentContract.Model{
 
         RegisterConfiguration defaultRegisterConfiguration();
 
-        ViewConfiguration getViewConfiguration(String viewConfigurationIdentifier);
-
-        Set<org.smartregister.configurableviews.model.View> getRegisterActiveColumns(String viewConfigurationIdentifier);
-
         String countSelect(String mainCondition);
 
         String mainSelect(String mainCondition);
 
-        String getFilterText(List<Field> filterList, String filter);
-
         String getSortText(Field sortField);
 
         AdvancedMatrixCursor createMatrixCursor(Response<String> response);

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<org.smartregister.configurableviews.model.View> visibleColumns) {
+    public void initializeAdapter(Set<IView> visibleColumns) {
 
         RepositoryHolder repoHolder = new RepositoryHolder();
 

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<org.smartregister.configurableviews.model.View> visibleColumns) {
+    public void initializeAdapter(Set<IView> visibleColumns) {
         RepositoryHolder repositoryHolder = new RepositoryHolder();
         repositoryHolder.setCommonRepository(commonRepository());
         repositoryHolder.setVaccineRepository(ImmunizationLibrary.getInstance().vaccineRepository());

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<View> getRegisterActiveColumns(String viewConfigurationIdentifier) {
+    public Set<IView> getRegisterActiveColumns(String viewConfigurationIdentifier) {
         return ConfigurableViewsLibrary.getInstance().getConfigurableViewsHelper().getRegisterActiveColumns(viewConfigurationIdentifier);
     }
 
@@ -53,8 +54,8 @@ public String mainSelect(String mainCondition) {
     }
 
     @Override
-    public String getFilterText(List<Field> list, String filterTitle) {
-        List<Field> filterList = list;
+    public String getFilterText(List<IField> list, String filterTitle) {
+        List<IField> filterList = list;
         if (filterList == null) {
             filterList = new ArrayList<>();
         }

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<org.smartregister.configurableviews.model.View> visibleColumns = new TreeSet<>();
+    protected Set<IView> 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<org.smartregister.configurableviews.model.View> visibleColumns) {
+    private void setVisibleColumns(Set<IView> visibleColumns) {
         this.visibleColumns = visibleColumns;
     }
 
@@ -94,7 +97,7 @@ protected ChildRegisterFragmentContract.View getView() {
     }
 
     @Override
-    public void updateSortAndFilter(List<Field> filterList, Field sortField) {
+    public void updateSortAndFilter(List<IField> filterList, IField sortField) {
         String filterText = model.getFilterText(filterList, getView().getString(R.string.filter));
         String sortText = model.getSortText(sortField);
 

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<String, String> metadataMap = StringUtils.isBlank(metadata) ? new HashMap<String, String>() : (Map<String, String>) new Gson()
                 .fromJson(metadata, new TypeToken<Map<String, String>>() {
                 }.getType());
 
-        startForm(formName, entityId, metadataMap, currentLocationId);
+        try {
+            startForm(formName, entityId, metadataMap, currentLocationId);
+        } catch (Exception e) {
+            Timber.e(e);
+        }
     }
 
     @Override

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;
+    }
 }

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<String> 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;
+    }
 }