Process skipped clients

.gitignore

@@ -32,4 +32,5 @@ target/
 tmp/
 opensrp-giz-malawi/debug/
 opensrp-giz-malawi/preview/
+opensrp-giz-malawi/releaseDebug/
 *google-services.json

README.md

@@ -13,10 +13,10 @@ These instructions will get you a copy of the project up and running on your loc
 ## Prerequisites
 [Tools and Frameworks Setup](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/6619207/Tools+and+Frameworks+Setup)
 
-## Development setup
-
 ### Steps to set up
-[OpenSRP android client app build](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/6619236/OpenSRP+App+Build)
+- [OpenSRP android client app build](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/6619236/OpenSRP+App+Build)
+- Add the client-id and client-secret values for the three environments i.e. stage, preview and production. Add these values to the `local.properties` as `client.id.[stage|preview|production]` and `client.secret.[stage|preview|production]`.
+- Add the `google-services.json` to `opensrp-client-giz-malawi/opensrp-giz-malawi`
 
 ### Running the tests
 

build.gradle

@@ -39,8 +39,8 @@ subprojects {
     ext.androidToolsBuildGradle = '4.0.1'
     ext.androidBuildToolsVersion = '29.0.3'
     ext.androidMinSdkVersion = 18
-    ext.androidCompileSdkVersion = 29
-    ext.androidTargetSdkVersion = 29
+    ext.androidCompileSdkVersion = 31
+    ext.androidTargetSdkVersion = 31
 
     ext.androidAnnotationsVersion = '3.0.1'
     ext.androidAnnotationsAPIVersion = '3.0.1'

opensrp-giz-malawi/build.gradle

@@ -25,6 +25,30 @@ jacoco {
     toolVersion = jacocoVersion
 }
 
+Properties properties = new Properties()
+if (project.rootProject.file("local.properties").exists()) {
+    properties.load(project.rootProject.file("local.properties").newDataInputStream())
+} else{
+    project.logger.error("local.properties file does not exist")
+}
+
+ext.getLocalProperty = { key ->
+    if (properties != null && properties.containsKey(key)) {
+        return properties[key]
+    } else {
+        project.logger.error(key + " could not be found. Setting it to an empty string")
+        return "\"\""
+    }
+}
+
+
+ext.checkKeys = { keys ->
+    keys.each { key ->
+        if (properties == null || !properties.containsKey(key)) {
+            project.logger.error(key + " is missing from the local.properties")
+        }
+    }
+}
 
 android {
     useLibrary 'org.apache.http.legacy'
@@ -35,8 +59,8 @@ android {
         applicationId "org.smartregister.giz"
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 46
-        versionName "0.4.6"
+        versionCode 49
+        versionName "0.4.9"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
@@ -50,34 +74,7 @@ android {
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
-        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")) {
-
-                buildConfigField "String", "OAUTH_CLIENT_ID", properties["oauth.client.id"]
-
-            } else {
-                project.logger.error("oauth.client.id variable is not set in your local.properties")
-                buildConfigField "String", "OAUTH_CLIENT_ID", "\"sample_client_id\""
-            }
-
-
-            if (properties != null && properties.containsKey("oauth.client.secret")) {
-
-                buildConfigField "String", "OAUTH_CLIENT_SECRET", properties["oauth.client.secret"]
-
-            } else {
-                project.logger.error("oauth.client.secret variable is not set in your local.properties")
-                buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"sample_client_secret\""
-            }
-        } else {
-            buildConfigField "String", "OAUTH_CLIENT_ID", '""'
-            buildConfigField "String", "OAUTH_CLIENT_SECRET", '""'
-        }
-
+        checkKeys(["oauth.client.id.production", "oauth.client.secret.production", "oauth.client.id.stage", "oauth.client.secret.stage", "oauth.client.id.preview", "oauth.client.secret.preview"])
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -128,6 +125,10 @@ android {
             buildConfigField "int", "GROWTH_MONITORING_SYNC_TIME", '15'
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Province", "District", "Facility", "Village"}'
             buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Province", "District", "Health Facility", "Village"}'
+
+            buildConfigField "String", "OAUTH_CLIENT_ID", getLocalProperty("oauth.client.id.production")
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", getLocalProperty("oauth.client.secret.production")
+
         }
 
         releaseDebug {
@@ -141,7 +142,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rule.pro'
             resValue "string", 'opensrp_url', '"https://opensrp.health.gov.mw/opensrp/"'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10'
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '2'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "int", "VACCINE_SYNC_TIME", '0'
             buildConfigField "int", "DATABASE_VERSION", '20'
@@ -157,6 +158,9 @@ android {
             buildConfigField "int", "GROWTH_MONITORING_SYNC_TIME", '15'
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Province", "District", "Facility", "Village"}'
             buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Province", "District", "Health Facility", "Village"}'
+
+            buildConfigField "String", "OAUTH_CLIENT_ID", getLocalProperty("oauth.client.id.production")
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", getLocalProperty("oauth.client.secret.production")
         }
 
         preview {
@@ -185,6 +189,9 @@ android {
             buildConfigField "int", "GROWTH_MONITORING_SYNC_TIME", '15'
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Province", "District", "Facility", "Village"}'
             buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Province", "District", "Health Facility", "Village"}'
+
+            buildConfigField "String", "OAUTH_CLIENT_ID", getLocalProperty("oauth.client.id.preview")
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", getLocalProperty("oauth.client.secret.preview")
         }
 
         debug {
@@ -210,6 +217,22 @@ android {
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Province", "District", "Facility", "Village"}'
             buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Province", "District", "Health Facility", "Village"}'
             testCoverageEnabled true
+
+            buildConfigField "String", "OAUTH_CLIENT_ID", getLocalProperty("oauth.client.id.stage")
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", getLocalProperty("oauth.client.secret.stage")
+        }
+    }
+
+    // https://stackoverflow.com/a/27119543/152938
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            outputFileName = new File(outputFileName.replace(".apk", "-${defaultConfig.versionName}.apk"))
+        }
+    }
+
+    testVariants.all { variant ->
+        variant.outputs.all { output ->
+            outputFileName = new File(outputFileName.replace(".apk", "-${defaultConfig.versionName}.apk"))
         }
     }
 
@@ -232,6 +255,8 @@ android {
     }
     configurations.all {
         exclude group: 'com.github.lecho', module: 'hellocharts-library'
+        exclude group: 'com.evernote', module: 'android-job'
+
     }
 }
 
@@ -269,16 +294,16 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    api('org.smartregister:opensrp-client-anc:2.0.3.29-LOCAL-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-anc:2.0.3.40-LOCAL-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
         exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
-//
-    api('org.smartregister:opensrp-client-native-form:2.1.11-SNAPSHOT@aar') {
+
+    api('org.smartregister:opensrp-client-native-form:2.1.14.1-GIZ-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
@@ -325,7 +350,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    api('org.smartregister:opensrp-client-immunization:4.0.6-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-immunization:4.0.7-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
@@ -376,7 +401,10 @@ dependencies {
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
     implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
-    implementation 'com.evernote:android-job:1.2.6'
+    implementation('com.github.devv911:android-job:1.4.5') {
+        exclude group: 'com.google.android', module: 'android'
+    }
+    implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'com.github.lecho:hellocharts-android:1.5.8@aar'
     implementation 'id.zelory:compressor:2.1.1'
     implementation('com.google.android.material:material:1.0.0') {
@@ -404,6 +432,8 @@ dependencies {
 
     implementation "androidx.multidex:multidex:2.0.1"
     testImplementation "androidx.work:work-testing:2.7.1"
+    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation 'androidx.test:core:1.3.0'
 
 
     def robolectricVersion = '4.1'

opensrp-giz-malawi/src/main/AndroidManifest.xml

@@ -50,6 +50,7 @@
             android:name=".activity.LoginActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.Login"
+            android:exported="true"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -280,17 +281,18 @@
             android:theme="@style/ChildTheme.NoActionBar"
             tools:replace="android:theme" />
         <!-- END OF PNC ACTIVITIES -->
-        <service android:name="org.smartregister.immunization.service.intent.VaccineIntentService" />
-        <service android:name="org.smartregister.immunization.service.intent.RecurringIntentService" />
-        <service android:name="org.smartregister.immunization.service.intent.VaccineSchedulesUpdateIntentService" />
-        <service android:name="org.smartregister.growthmonitoring.service.intent.ZScoreRefreshIntentService" />
-        <service android:name="org.smartregister.growthmonitoring.service.intent.WeightIntentService" />
-        <service android:name="org.smartregister.growthmonitoring.service.intent.HeightIntentService" />
-        <service android:name="org.smartregister.sync.intent.PullUniqueIdsIntentService" />
-        <service android:name="org.smartregister.sync.intent.ValidateIntentService" />
-        <service android:name="org.smartregister.sync.intent.ExtendedSyncIntentService" />
-        <service android:name="org.smartregister.sync.intent.SettingsSyncIntentService" />
-        <service android:name="org.smartregister.sync.intent.SyncIntentService" />
+        <service android:name="org.smartregister.immunization.service.intent.VaccineIntentService" android:exported="false" />
+        <service android:name="org.smartregister.immunization.service.intent.RecurringIntentService" android:exported="false" />
+        <service android:name="org.smartregister.immunization.service.intent.VaccineSchedulesUpdateIntentService"  android:exported="false"/>
+        <service android:name="org.smartregister.growthmonitoring.service.intent.ZScoreRefreshIntentService" android:exported="false" />
+        <service android:name="org.smartregister.growthmonitoring.service.intent.WeightIntentService"  android:exported="false"/>
+        <service android:name="org.smartregister.growthmonitoring.service.intent.HeightIntentService" android:exported="false"/>
+        <service android:name="org.smartregister.sync.intent.PullUniqueIdsIntentService" android:exported="false" />
+        <service android:name="org.smartregister.sync.intent.ValidateIntentService" android:exported="false"/>
+        <service android:name="org.smartregister.sync.intent.ExtendedSyncIntentService" android:exported="false" />
+        <service android:name="org.smartregister.sync.intent.SettingsSyncIntentService" android:exported="false" />
+        <service android:name="org.smartregister.sync.intent.SyncIntentService" android:exported="false" />
+        <service android:name=".service.ReProcessSyncIntentService" android:exported="false"/>
 
         <uses-library
             android:name="org.apache.http.legacy"

opensrp-giz-malawi/src/main/assets/ec_client_classification.json

@@ -202,6 +202,10 @@
             "field_value": "Death",
             "creates_case": [
               "deceased"
+            ],
+            "closes_case": [
+              "ec_client",
+              "ec_child_details"
             ]
           },
           {
@@ -268,6 +272,13 @@
             "creates_case": [
               "reason_for_defaulting"
             ]
+          },
+          {
+            "field": "eventType",
+            "field_value": "OPD Close",
+            "closes_case": [
+              "ec_client"
+            ]
           }
         ]
       }

opensrp-giz-malawi/src/main/java/org/smartregister/anc/library/presenter/ContactWizardJsonFormFragmentPresenter2.java

@@ -0,0 +1,95 @@
+package org.smartregister.anc.library.presenter;
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.vijay.jsonwizard.constants.JsonFormConstants;
+import com.vijay.jsonwizard.fragments.JsonFormFragment;
+import com.vijay.jsonwizard.interactors.JsonFormInteractor;
+import com.vijay.jsonwizard.presenters.JsonWizardFormFragmentPresenter;
+import com.vijay.jsonwizard.views.JsonFormFragmentView;
+import com.vijay.jsonwizard.widgets.NativeRadioButtonFactory;
+
+import org.apache.commons.lang3.StringUtils;
+import org.smartregister.anc.library.fragment.ContactWizardJsonFormFragment;
+import org.smartregister.anc.library.util.ANCFormUtils;
+import org.smartregister.anc.library.util.ConstantsUtils;
+
+/**
+ * Created by keyman on 04/08/18.
+ */
+public class ContactWizardJsonFormFragmentPresenter2 extends JsonWizardFormFragmentPresenter {
+
+    public static final String TAG = ContactWizardJsonFormFragmentPresenter2.class.getName();
+
+    public ContactWizardJsonFormFragmentPresenter2(JsonFormFragment formFragment, JsonFormInteractor jsonFormInteractor) {
+        super(formFragment, jsonFormInteractor);
+    }
+
+    @Override
+    public void setUpToolBar() {
+        super.setUpToolBar();
+
+    }
+
+    @Override
+    protected boolean moveToNextWizardStep() {
+        String nextStep = getFormFragment().getJsonApi().nextStep();
+        if (StringUtils.isNotBlank(nextStep)) {
+
+            getFormFragment().getJsonApi().getAppExecutors().mainThread().execute(new Runnable() {
+                @Override
+                public void run() {
+
+                    JsonFormFragment next = ContactWizardJsonFormFragment.getFormFragment(nextStep);
+                    JsonFormFragmentView jsonFormFragmentView = getView();
+                    if (jsonFormFragmentView != null) {
+                        jsonFormFragmentView.hideKeyBoard();
+                        jsonFormFragmentView.transactThis(next);
+                    }
+                }
+            });
+
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onClick(View view) {
+        key = (String) view.getTag(com.vijay.jsonwizard.R.id.key);
+        type = (String) view.getTag(com.vijay.jsonwizard.R.id.type);
+        switch (type) {
+            case ConstantsUtils.EXPANSION_PANEL:
+                String info = (String) view.getTag(com.vijay.jsonwizard.R.id.label_dialog_info);
+                if (!TextUtils.isEmpty(info)) {
+                    showInformationDialog(view);
+                }
+                break;
+            case ConstantsUtils.EXTENDED_RADIO_BUTTON:
+                showInformationDialog(view);
+                break;
+            default:
+                super.onClick(view);
+                break;
+        }
+    }
+
+    @Override
+    protected void nativeRadioButtonClickActions(View view) {
+        String type = (String) view.getTag(com.vijay.jsonwizard.R.id.specify_type);
+        String specifyWidget = (String) view.getTag(com.vijay.jsonwizard.R.id.specify_widget);
+        Log.i(TAG, "The dialog content widget is this: " + specifyWidget);
+        if (JsonFormConstants.CONTENT_INFO.equals(type) && specifyWidget.equals(JsonFormConstants.DATE_PICKER)) {
+            NativeRadioButtonFactory.showDateDialog(view);
+        } else if (JsonFormConstants.CONTENT_INFO.equals(type) && !specifyWidget.equals(JsonFormConstants.DATE_PICKER)) {
+            ANCFormUtils formUtils = new ANCFormUtils();
+            formUtils.showGenericDialog(view);
+        } else if (view.getId() == com.vijay.jsonwizard.R.id.label_edit_button) {
+            setRadioViewsEditable(view);
+        } else {
+            showInformationDialog(view);
+        }
+    }
+}

opensrp-giz-malawi/src/main/java/org/smartregister/giz/activity/ChildProfileActivity.java

@@ -8,6 +8,7 @@
 import org.smartregister.view.activity.BaseProfileActivity;
 
 public class ChildProfileActivity extends BaseProfileActivity {
+
     @Override
     protected void attachBaseContext(android.content.Context base) {
         // get language from prefs