WD| Setup Service mode for Registers #4

opensrp · Nov 16, 2017 · 7c1041b · 7c1041b
1 parent 7d4a949
commit 7c1041b
Show file tree

Hide file tree

Showing 16 changed files with 806 additions and 683 deletions.
diff --git a/bidan-cloudant/libs/sd-sdk-facial-processing.jar b/bidan-cloudant/libs/sd-sdk-facial-processing.jar
diff --git a/...ant/src/main/java/org/smartregister/bidan_cloudant/fragment/ANCSmartRegisterFragment.java b/...ant/src/main/java/org/smartregister/bidan_cloudant/fragment/ANCSmartRegisterFragment.java
@@ -24,8 +24,8 @@
 import org.smartregister.bidan_cloudant.activity.LoginActivity;
 import org.smartregister.bidan_cloudant.libs.FlurryFacade;
 import org.smartregister.bidan_cloudant.option.KICommonObjectFilterOption;
-import org.smartregister.bidan_cloudant.option.VaksinatorServiceModeOption;
-import org.smartregister.bidan_cloudant.provider.ChildSmartClientsProvider;
+import org.smartregister.bidan_cloudant.option.ANCServiceModeOption;
+import org.smartregister.bidan_cloudant.provider.ANCSmartClientsProvider;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.commonregistry.CommonPersonObjectController;
 import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
@@ -94,7 +94,7 @@ protected SecuredNativeSmartRegisterActivity.DefaultOptionsProvider getDefaultOp
 
             @Override
             public ServiceModeOption serviceMode() {
-                return new VaksinatorServiceModeOption(clientsProvider());
+                return new ANCServiceModeOption(clientsProvider());
             }
 
             @Override
@@ -256,7 +256,7 @@ private void initializeQueries() {
         String tableName = "ec_anak";
       //  String parentTableName = PathConstants.MOTHER_TABLE_NAME;
 
-        ChildSmartClientsProvider hhscp = new ChildSmartClientsProvider(getActivity(),
+        ANCSmartClientsProvider hhscp = new ANCSmartClientsProvider(getActivity(),
                 clientActionHandler, context().alertService(), context().commonrepository(tableName));
         clientAdapter = new SmartRegisterPaginatedCursorAdapter(getActivity(), null, hhscp, context().commonrepository(tableName));
         clientsView.setAdapter(clientAdapter);

diff --git a/...t/src/main/java/org/smartregister/bidan_cloudant/fragment/ChildSmartRegisterFragment.java b/...t/src/main/java/org/smartregister/bidan_cloudant/fragment/ChildSmartRegisterFragment.java
@@ -24,7 +24,7 @@
 import org.smartregister.bidan_cloudant.activity.LoginActivity;
 import org.smartregister.bidan_cloudant.libs.FlurryFacade;
 import org.smartregister.bidan_cloudant.option.KICommonObjectFilterOption;
-import org.smartregister.bidan_cloudant.option.VaksinatorServiceModeOption;
+import org.smartregister.bidan_cloudant.option.ChildServiceModeOption;
 import org.smartregister.bidan_cloudant.provider.ChildSmartClientsProvider;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.commonregistry.CommonPersonObjectController;
@@ -94,7 +94,7 @@ protected SecuredNativeSmartRegisterActivity.DefaultOptionsProvider getDefaultOp
 
             @Override
             public ServiceModeOption serviceMode() {
-                return new VaksinatorServiceModeOption(clientsProvider());
+                return new ChildServiceModeOption(clientsProvider());
             }
 
             @Override

diff --git a/...dant/src/main/java/org/smartregister/bidan_cloudant/fragment/FPSmartRegisterFragment.java b/...dant/src/main/java/org/smartregister/bidan_cloudant/fragment/FPSmartRegisterFragment.java
@@ -24,8 +24,8 @@
 import org.smartregister.bidan_cloudant.activity.LoginActivity;
 import org.smartregister.bidan_cloudant.libs.FlurryFacade;
 import org.smartregister.bidan_cloudant.option.KICommonObjectFilterOption;
-import org.smartregister.bidan_cloudant.option.VaksinatorServiceModeOption;
-import org.smartregister.bidan_cloudant.provider.ChildSmartClientsProvider;
+import org.smartregister.bidan_cloudant.option.FPServiceModeOption;
+import org.smartregister.bidan_cloudant.provider.FPSmartClientsProvider;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.commonregistry.CommonPersonObjectController;
 import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
@@ -94,7 +94,7 @@ protected SecuredNativeSmartRegisterActivity.DefaultOptionsProvider getDefaultOp
 
             @Override
             public ServiceModeOption serviceMode() {
-                return new VaksinatorServiceModeOption(clientsProvider());
+                return new FPServiceModeOption(clientsProvider());
             }
 
             @Override
@@ -256,7 +256,7 @@ private void initializeQueries() {
         String tableName = "ec_anak";
       //  String parentTableName = PathConstants.MOTHER_TABLE_NAME;
 
-        ChildSmartClientsProvider hhscp = new ChildSmartClientsProvider(getActivity(),
+        FPSmartClientsProvider hhscp = new FPSmartClientsProvider(getActivity(),
                 clientActionHandler, context().alertService(), context().commonrepository(tableName));
         clientAdapter = new SmartRegisterPaginatedCursorAdapter(getActivity(), null, hhscp, context().commonrepository(tableName));
         clientsView.setAdapter(clientAdapter);

diff --git a/.../src/main/java/org/smartregister/bidan_cloudant/fragment/MotherSmartRegisterFragment.java b/.../src/main/java/org/smartregister/bidan_cloudant/fragment/MotherSmartRegisterFragment.java
@@ -24,8 +24,8 @@
 import org.smartregister.bidan_cloudant.activity.LoginActivity;
 import org.smartregister.bidan_cloudant.libs.FlurryFacade;
 import org.smartregister.bidan_cloudant.option.KICommonObjectFilterOption;
-import org.smartregister.bidan_cloudant.option.VaksinatorServiceModeOption;
-import org.smartregister.bidan_cloudant.provider.ChildSmartClientsProvider;
+import org.smartregister.bidan_cloudant.option.MotherServiceModeOption;
+import org.smartregister.bidan_cloudant.provider.MotherSmartClientsProvider;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.commonregistry.CommonPersonObjectController;
 import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
@@ -91,7 +91,7 @@ protected SecuredNativeSmartRegisterActivity.DefaultOptionsProvider getDefaultOp
 
             @Override
             public ServiceModeOption serviceMode() {
-                return new VaksinatorServiceModeOption(clientsProvider());
+                return new MotherServiceModeOption(clientsProvider());
             }
 
             @Override
@@ -120,11 +120,9 @@ protected SecuredNativeSmartRegisterActivity.NavBarOptionsProvider getNavBarOpti
             @Override
             public DialogOption[] filterOptions() {
                 FlurryAgent.logEvent("click_filter_option_on_kohort_ibu_dashboard");
-                ArrayList<DialogOption> dialogOptionslist = new ArrayList<DialogOption>();
+                ArrayList<DialogOption> dialogOptionslist = new ArrayList<>();
 
                 dialogOptionslist.add(new CursorCommonObjectFilterOption(getString(R.string.filter_by_all_label),filterStringForAll()));
-                //     dialogOptionslist.add(new CursorCommonObjectFilterOption(getString(R.string.hh_no_mwra),filterStringForNoElco()));
-                //      dialogOptionslist.add(new CursorCommonObjectFilterOption(getString(R.string.hh_has_mwra),filterStringForOneOrMoreElco()));
 
                 String locationjson = context().anmLocationController().get();
                 LocationTree locationTree = EntityUtils.fromJson(locationjson, LocationTree.class);
@@ -152,10 +150,10 @@ public DialogOption[] sortingOptions() {
 //                        new HouseholdCensusDueDateSort(),
 
 
-                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label),KiSortByNameAZ()),
-                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label_reverse),KiSortByNameZA()),
-                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_child_age),KiSortByAgeASC()),
-                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_child_age_desc),KiSortByAgeDESC()),
+                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label), KiSortByNameAZ()),
+                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label_reverse), KiSortByNameZA()),
+                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_child_age), KiSortByAgeASC()),
+                        new CursorCommonObjectSort(getResources().getString(R.string.sort_by_child_age_desc), KiSortByAgeDESC()),
                 };
             }
 
@@ -216,7 +214,7 @@ private void initializeQueries() {
         String tableName = "ec_anak";
       //  String parentTableName = PathConstants.MOTHER_TABLE_NAME;
 
-        ChildSmartClientsProvider hhscp = new ChildSmartClientsProvider(getActivity(),
+        MotherSmartClientsProvider hhscp = new MotherSmartClientsProvider(getActivity(),
                 clientActionHandler, context().alertService(), context().commonrepository(tableName));
         clientAdapter = new SmartRegisterPaginatedCursorAdapter(getActivity(), null, hhscp, context().commonrepository(tableName));
         clientsView.setAdapter(clientAdapter);

diff --git a/...ant/src/main/java/org/smartregister/bidan_cloudant/fragment/PNCSmartRegisterFragment.java b/...ant/src/main/java/org/smartregister/bidan_cloudant/fragment/PNCSmartRegisterFragment.java
@@ -24,8 +24,8 @@
 import org.smartregister.bidan_cloudant.activity.LoginActivity;
 import org.smartregister.bidan_cloudant.libs.FlurryFacade;
 import org.smartregister.bidan_cloudant.option.KICommonObjectFilterOption;
-import org.smartregister.bidan_cloudant.option.VaksinatorServiceModeOption;
-import org.smartregister.bidan_cloudant.provider.ChildSmartClientsProvider;
+import org.smartregister.bidan_cloudant.option.PNCServiceModeOption;
+import org.smartregister.bidan_cloudant.provider.PNCSmartClientsProvider;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.commonregistry.CommonPersonObjectController;
 import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
@@ -94,7 +94,7 @@ protected SecuredNativeSmartRegisterActivity.DefaultOptionsProvider getDefaultOp
 
             @Override
             public ServiceModeOption serviceMode() {
-                return new VaksinatorServiceModeOption(clientsProvider());
+                return new PNCServiceModeOption(clientsProvider());
             }
 
             @Override
@@ -256,7 +256,7 @@ private void initializeQueries() {
         String tableName = "ec_anak";
       //  String parentTableName = PathConstants.MOTHER_TABLE_NAME;
 
-        ChildSmartClientsProvider hhscp = new ChildSmartClientsProvider(getActivity(),
+        PNCSmartClientsProvider hhscp = new PNCSmartClientsProvider(getActivity(),
                 clientActionHandler, context().alertService(), context().commonrepository(tableName));
         clientAdapter = new SmartRegisterPaginatedCursorAdapter(getActivity(), null, hhscp, context().commonrepository(tableName));
         clientsView.setAdapter(clientAdapter);