opensrp · qaziabubakar-vd · Apr 26, 2021 · Apr 26, 2021 · Apr 27, 2021 · Apr 28, 2021
diff --git a/build.gradle b/build.gradle
@@ -67,8 +67,8 @@ subprojects {
     ext.androidToolsBuildGradle = '4.0.1'
     ext.androidBuildToolsVersion = '29.0.3'
     ext.androidMinSdkVersion = 19
-    ext.androidCompileSdkVersion = 29
-    ext.androidTargetSdkVersion = 29
+    ext.androidCompileSdkVersion = 30
+    ext.androidTargetSdkVersion = 30
 
     ext.androidAnnotationsVersion = '3.0.1'
     ext.androidAnnotationsAPIVersion = '3.0.1'

diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle
@@ -52,6 +52,8 @@ jacoco {
     toolVersion = "0.8.5"
 }
 
+Properties properties = new Properties()
+
 android {
     useLibrary 'org.apache.http.legacy'
     compileSdkVersion androidCompileSdkVersion
@@ -82,6 +84,7 @@ android {
         buildConfigField "boolean", "IS_SYNC_SETTINGS", "false"
         buildConfigField "String", "THINKMD_BASE_URL", '"https://app.africa.thinkmd.tech"'
         buildConfigField "String", "THINKMD_END_POINT", '"/#/start"'
+        buildConfigField "String", "ROOT_LOCATION_TAG", '"Country"'
         buildConfigField "int", "MAX_CONNECTION_TIMEOUT", '1'
         buildConfigField "int", "MAX_READ_TIMEOUT", '1'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -93,7 +96,6 @@ android {
 
         if (project.rootProject.file("local.properties").exists()) {
 
-            Properties properties = new Properties()
             properties.load(project.rootProject.file("local.properties").newDataInputStream())
 
             if (properties != null && properties.containsKey("oauth.client.id")) {
@@ -160,7 +162,7 @@ android {
         }
 
         debug {
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '30'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '15'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "boolean", "TIME_CHECK", "false"
@@ -270,6 +272,21 @@ android {
             buildConfigField "int", "MAX_READ_TIMEOUT", '5'
             buildConfigField "int", "DATABASE_VERSION", '12'
         }
+        nigeria {
+            dimension = 'baseDimension'
+            applicationIdSuffix ".nigeria"
+            versionCode 5
+            versionName "1.0.5"
+            buildConfigField "String", 'opensrp_url', '"https://dcis-ng.smartregister.org/opensrp/"'
+            buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/chad/"'
+            buildConfigField "String", 'opensrp_url_debug', '"https://dcis-ng.labs.smartregister.org/opensrp/"'
+            buildConfigField "String[]", "LOCATION_HIERACHY", '{"State" , "Lga" , "Ward","Community","Sub-Community"}'
+            buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"State" , "Lga" , "Ward","Community","Sub-Community"}'
+            buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"State" , "Lga" , "Ward","Community","Sub-Community"}'
+            buildConfigField "String", 'DEFAULT_LOCATION', '"Sub-Community"'
+            buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"Sub-Community"'
+            buildConfigField "int", "DATABASE_VERSION", '16'
+        }
         guinea {
             dimension = 'baseDimension'
             applicationIdSuffix ".guinea"
@@ -359,6 +376,8 @@ dependencies {
         exclude group: 'stax', module: 'stax-api'
     }
 
+    debugImplementation 'com.amitshekhar.android:debug-db-encrypt:1.0.6'
+
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
     implementation('io.ona.kujaku:library:0.9.0') {
         exclude group: 'com.android.volley', module: 'volley'

diff --git a/opensrp-chw/src/main/AndroidManifest.xml b/opensrp-chw/src/main/AndroidManifest.xml
@@ -109,7 +109,7 @@
                 android:value="org.smartregister.chw.activity.FamilyProfileActivity" />
         </activity>
         <activity
-            android:name="org.smartregister.family.activity.FamilyWizardFormActivity"
+            android:name="org.smartregister.chw.activity.FamilyWizardFormExtendedActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/FamilyTheme.NoActionBar"
@@ -167,7 +167,7 @@
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:roundIcon="@drawable/ic_launcher_round"
+            android:roundIcon="@drawable/ic_launcher"
             android:screenOrientation="portrait"
             android:theme="@style/ChwTheme.Login"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
@@ -289,6 +289,7 @@
         <service android:name="org.smartregister.sync.intent.ExtendedSyncIntentService" />
         <service android:name="org.smartregister.sync.intent.SyncLocationsByLevelAndTagsIntentService" />
         <service android:name="org.smartregister.sync.intent.DocumentConfigurationIntentService" />
+        <service android:name="org.smartregister.sync.intent.SyncAllLocationsIntentService" />
         <service android:name="org.smartregister.sync.intent.ValidateIntentService" />
         <service android:name="org.smartregister.service.ImageUploadSyncService" />
         <service android:name=".anc.intent.HomeVisitIntentService" />

diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/activity/DefaultChildProfileActivityFlv.java b/opensrp-chw/src/main/java/org/smartregister/chw/activity/DefaultChildProfileActivityFlv.java
@@ -100,6 +100,6 @@ public void setVaccineHistoryView(String days, RelativeLayout layoutVaccineHisto
 
     @Override
     public String getToolbarTitleName(MemberObject memberObject) {
-        return memberObject.getFirstName();
+        return memberObject.getFamilyName();
     }
 }
diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/activity/FamilyRegisterActivity.java b/opensrp-chw/src/main/java/org/smartregister/chw/activity/FamilyRegisterActivity.java
@@ -11,8 +11,10 @@
 import org.smartregister.chw.core.custom_views.NavigationMenu;
 import org.smartregister.chw.fragment.FamilyRegisterFragment;
 import org.smartregister.chw.listener.ChwBottomNavigationListener;
+import org.smartregister.chw.model.FamilyRegisterModel;
 import org.smartregister.chw.util.Constants;
 import org.smartregister.chw.util.Utils;
+import org.smartregister.family.presenter.BaseFamilyRegisterPresenter;
 import org.smartregister.helper.BottomNavigationHelper;
 import org.smartregister.view.fragment.BaseRegisterFragment;
 
@@ -40,6 +42,11 @@ protected void registerBottomNavigation() {
         FamilyRegisterActivity.registerBottomNavigation(bottomNavigationHelper, bottomNavigationView, this);
     }
 
+    @Override
+    protected void initializePresenter() {
+        presenter = new BaseFamilyRegisterPresenter(this, new FamilyRegisterModel());
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/...rp-chw/src/main/java/org/smartregister/chw/activity/FamilyWizardFormExtendedActivity.java b/...rp-chw/src/main/java/org/smartregister/chw/activity/FamilyWizardFormExtendedActivity.java
@@ -0,0 +1,17 @@
+package org.smartregister.chw.activity;
+
+import com.vijay.jsonwizard.constants.JsonFormConstants;
+
+import org.smartregister.chw.fragment.FamilyRegisterJsonFormFragment;
+import org.smartregister.family.activity.FamilyWizardFormActivity;
+
+public class FamilyWizardFormExtendedActivity extends FamilyWizardFormActivity {
+    FamilyRegisterJsonFormFragment familyRegisterJsonFormFragment;
+
+    @Override
+    public void initializeFormFragment() {
+        familyRegisterJsonFormFragment = FamilyRegisterJsonFormFragment.getFormFragment(JsonFormConstants.FIRST_STEP_NAME);
+        getSupportFragmentManager().beginTransaction()
+                .add(com.vijay.jsonwizard.R.id.container, familyRegisterJsonFormFragment).commit();
+    }
+}
diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/activity/JsonWizardFormExtendedActivity.java b/opensrp-chw/src/main/java/org/smartregister/chw/activity/JsonWizardFormExtendedActivity.java
@@ -0,0 +1,17 @@
+package org.smartregister.chw.activity;
+
+import com.vijay.jsonwizard.activities.JsonWizardFormActivity;
+import com.vijay.jsonwizard.constants.JsonFormConstants;
+
+import org.smartregister.chw.fragment.FamilyRegisterJsonFormFragment;
+
+public class JsonWizardFormExtendedActivity extends JsonWizardFormActivity {
+    FamilyRegisterJsonFormFragment familyRegisterJsonFormFragment;
+
+    @Override
+    public void initializeFormFragment() {
+        familyRegisterJsonFormFragment = FamilyRegisterJsonFormFragment.getFormFragment(JsonFormConstants.FIRST_STEP_NAME);
+        getSupportFragmentManager().beginTransaction()
+                .add(com.vijay.jsonwizard.R.id.container, familyRegisterJsonFormFragment).commit();
+    }
+}
diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/application/ChwApplication.java b/opensrp-chw/src/main/java/org/smartregister/chw/application/ChwApplication.java
@@ -1,5 +1,7 @@
 package org.smartregister.chw.application;
 
+import static org.koin.core.context.GlobalContext.getOrNull;
+
 import android.Manifest;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -44,7 +46,6 @@
 import org.smartregister.chw.core.provider.CoreAllClientsRegisterQueryProvider;
 import org.smartregister.chw.core.service.CoreAuthorizationService;
 import org.smartregister.chw.core.utils.CoreConstants;
-import org.smartregister.chw.core.utils.FormUtils;
 import org.smartregister.chw.custom_view.NavigationMenuFlv;
 import org.smartregister.chw.fp.FpLibrary;
 import org.smartregister.chw.fp.util.FamilyPlanningConstants;
@@ -62,6 +63,7 @@
 import org.smartregister.chw.util.ChwLocationBasedClassifier;
 import org.smartregister.chw.util.FailSafeRecalledID;
 import org.smartregister.chw.util.FileUtils;
+import org.smartregister.chw.util.FormUtils;
 import org.smartregister.chw.util.JsonFormUtils;
 import org.smartregister.chw.util.Utils;
 import org.smartregister.commonregistry.CommonFtsObject;
@@ -96,8 +98,6 @@
 import io.ona.kujaku.KujakuLibrary;
 import timber.log.Timber;
 
-import static org.koin.core.context.GlobalContext.getOrNull;
-
 public class ChwApplication extends CoreChwApplication implements SyncStatusBroadcastReceiver.SyncStatusListener, P2pProcessingStatusBroadcastReceiver.StatusUpdate {
 
     private static Flavor flavor = new ChwApplicationFlv();
@@ -326,7 +326,6 @@ public void logoutCurrentUser() {
     @Override
     public FamilyMetadata getMetadata() {
         FamilyMetadata metadata = FormUtils.getFamilyMetadata(new FamilyProfileActivity(), getDefaultLocationLevel(), getFacilityHierarchy(), getFamilyLocationFields());
-
         HashMap<String, String> setting = new HashMap<>();
         setting.put(Constants.CustomConfig.FAMILY_FORM_IMAGE_STEP, JsonFormUtils.STEP1);
         setting.put(Constants.CustomConfig.FAMILY_MEMBER_FORM_IMAGE_STEP, JsonFormUtils.STEP2);
@@ -614,6 +613,8 @@ public interface Flavor {
         Map<String, String[]> getFTSSearchMap();
 
         Map<String, String[]> getFTSSortMap();
+
+        boolean launchWashCheckOnNativeForm();
     }
 
 }
diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/application/ChwSyncConfiguration.java b/opensrp-chw/src/main/java/org/smartregister/chw/application/ChwSyncConfiguration.java
@@ -1,5 +1,7 @@
 package org.smartregister.chw.application;
 
+import static org.smartregister.util.Utils.isEmptyCollection;
+
 import com.google.common.collect.ImmutableList;
 
 import org.apache.commons.lang3.StringUtils;
@@ -13,8 +15,6 @@
 
 import java.util.List;
 
-import static org.smartregister.util.Utils.isEmptyCollection;
-
 /**
  * Created by samuelgithengi on 10/19/18.
  */

diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/application/DefaultChwApplicationFlv.java b/opensrp-chw/src/main/java/org/smartregister/chw/application/DefaultChwApplicationFlv.java
@@ -299,4 +299,9 @@ public Map<String, String[]> getFTSSortMap() {
     public boolean showsPhysicallyDisabledView() {
         return true;
     }
+
+    @Override
+    public boolean launchWashCheckOnNativeForm() {
+        return false;
+    }
 }
diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/dao/WashCheckDao.java b/opensrp-chw/src/main/java/org/smartregister/chw/dao/WashCheckDao.java
@@ -1,5 +1,7 @@
 package org.smartregister.chw.dao;
 
+import static org.mvel2.DataConversion.convert;
+
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.apache.commons.lang3.StringUtils;
@@ -14,10 +16,17 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.mvel2.DataConversion.convert;
-
 public class WashCheckDao extends AbstractDao {
 
+    public static List<String> getLastWashCheckVisitId(String familyBaseEntityID) {
+        String sql = "SELECT visit_id FROM visits WHERE visit_type = 'WASH check' AND " +
+                "base_entity_id = '" + familyBaseEntityID + "' order by created_at ASC";
+
+        DataMap<String> dataMap = c -> getCursorValue(c, "visit_id");
+
+        return AbstractDao.readData(sql, dataMap);
+    }
+
     public static long getLastWashCheckDate(String familyBaseEntityID) {
         String sql = "select CASE WHEN created_at <= visit_date THEN created_at ELSE visit_date END wash_check_date from visits where visit_type = 'WASH check' and " +
                 "base_entity_id = '" + familyBaseEntityID + "' order by created_at desc limit 1";