Implement hiv and tb registers

.github/workflows/ci.yml

@@ -5,9 +5,9 @@ name: Android CI with Gradle
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
   pull_request:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
 
 jobs:
   unit_tests:

build.gradle

@@ -4,15 +4,14 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url 'https://jitpack.io' }
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" }
-        maven { url "http://dl.bintray.com/ona/kujaku" }
         maven{  url "https://plugins.gradle.org/m2/" }
         mavenLocal()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.0'
@@ -42,7 +41,6 @@ allprojects {
 
     repositories {
         google()
-        jcenter()
         mavenLocal()
         mavenCentral()
         maven { url 'https://maven.google.com' }
@@ -54,10 +52,8 @@ allprojects {
         maven { url 'https://maven.fabric.io/public' }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-        maven { url "https://dl.bintray.com/ona/rdt-capture" }
-        maven { url "http://dl.bintray.com/ona/kujaku" }
-        maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'}
         maven{  url "https://plugins.gradle.org/m2/" }
+        jcenter()
     }
 }
 

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=1.5.21-SNAPSHOT
+VERSION_NAME=1.5.28-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Chw Core Library

opensrp-chw-core/build.gradle

@@ -107,7 +107,7 @@ dependencies {
     //implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
-    implementation('io.ona.kujaku:library:0.8.9') {
+    implementation('io.ona.kujaku:library:0.9.0') {
         exclude group: 'com.android.volley', module: 'volley'
         exclude group: 'stax', module: 'stax-api'
     }
@@ -136,9 +136,9 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
 
-    compileOnly 'com.ibm.fhir:fhir-model:4.2.3'
+    compileOnly 'com.ibm.fhir:fhir-model:4.7.0'
 
-    api('org.smartregister:opensrp-client-core:1.15.4-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-core:1.15.3-CHWv1-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
@@ -147,6 +147,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.rengwuxian.materialedittext', module: 'library'
         exclude group: 'com.ibm.fhir', module: 'fhir-model'
+        exclude group: 'id.zelory', module: 'compressor'
     }
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
@@ -157,7 +158,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    api('org.smartregister:opensrp-client-family:1.3.1-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-family:1.3.2-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
@@ -170,6 +171,7 @@ dependencies {
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
         exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'id.zelory', module: 'compressor'
     }
 
     api('org.smartregister:opensrp-client-reporting:0.0.22-SNAPSHOT@aar') {
@@ -188,6 +190,7 @@ dependencies {
         exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.github.lecho', module: 'hellocharts-android'
+        exclude group: 'id.zelory', module: 'compressor'
     }
 
     api('org.smartregister:opensrp-client-chw-anc:1.1.2-SNAPSHOT@aar') {
@@ -207,29 +210,33 @@ dependencies {
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
         exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
         exclude group: 'org.smartregister', module: 'opensrp-client-immunization'
+        exclude group: 'id.zelory', module: 'compressor'
     }
 
-    api('org.smartregister:opensrp-client-chw-malaria:1.2.18-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-chw-malaria:1.2.19-SNAPSHOT@aar') {
         transitive = true
         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'
+        exclude group: 'id.zelory', module: 'compressor'
     }
 
-    api('org.smartregister:opensrp-chw-family-planning:1.0.26-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-chw-family-planning:1.0.27-SNAPSHOT@aar') {
         transitive = true
         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'
+        exclude group: 'id.zelory', module: 'compressor'
     }
-    api('org.smartregister:opensrp-client-chw-referral:1.3.5-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-chw-referral:1.3.6-SNAPSHOT@aar') {
         transitive = true
         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'
+        exclude group: 'id.zelory', module: 'compressor'
     }
 
     api('org.smartregister:opensrp-client-opd:0.0.13-SNAPSHOT@aar') {
@@ -242,6 +249,24 @@ dependencies {
         exclude group: 'id.zelory', module: 'compressor'
     }
 
+    implementation "id.zelory:compressor:2.1.1"
+    api('org.smartregister:opensrp-client-chw-hiv:1.0.3-SNAPSHOT@aar') {
+        transitive = true
+        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-chw-tb:1.0.0-SNAPSHOT@aar') {
+        transitive = true
+        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'
+        exclude group: 'com.nerdstone', module: 'neat-form-core'
+    }
+
     api 'com.google.guava:guava:20.0'
     api 'io.reactivex.rxjava2:rxandroid:2.1.1'
     // Because RxAndroid releases are few and far between, it is recommended you also

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/BaseReferralTaskViewActivity.java

@@ -166,7 +166,7 @@ protected void getReferralDetails() {
         }
     }
 
-    private void setClientName() {
+    protected void setClientName() {
         String firstName = Utils.getValue(getPersonObjectClient().getColumnmaps(), FIRST_NAME, true);
         String lastName = Utils.getValue(getPersonObjectClient().getColumnmaps(), LAST_NAME, true);
         String middleName = Utils.getValue(getPersonObjectClient().getColumnmaps(), MIDDLE_NAME, true);
@@ -190,15 +190,15 @@ private String getChildrenForPncWoman(String baseEntityId) {
                 getString(R.string.children_prefix, children);
     }
 
-    private void updateProblemDisplay() {
+    protected void updateProblemDisplay() {
         if (CoreConstants.TASKS_FOCUS.ANC_DANGER_SIGNS.equals(getTask().getFocus())) {
             clientReferralProblem.setText(getString(R.string.anc_danger_sign_prefix, getTask().getDescription()));
         } else {
             clientReferralProblem.setText(getTask().getDescription());
         }
     }
 
-    private String getFamilyMemberContacts() {
+    protected String getFamilyMemberContacts() {
 
         String familyPhoneNumber = Utils.getValue(getPersonObjectClient().getColumnmaps(), ChildDBConstants.KEY.FAMILY_MEMBER_PHONENUMBER, true);
         String familyPhoneNumberOther = Utils.getValue(getPersonObjectClient().getColumnmaps(), ChildDBConstants.KEY.FAMILY_MEMBER_PHONENUMBER_OTHER, true);

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CoreAllClientsMemberProfileActivity.java

@@ -0,0 +1,159 @@
+package org.smartregister.chw.core.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+
+import com.vijay.jsonwizard.constants.JsonFormConstants;
+import com.vijay.jsonwizard.domain.Form;
+
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONObject;
+import org.smartregister.chw.core.R;
+import org.smartregister.chw.core.contract.CoreAllClientsMemberContract;
+import org.smartregister.chw.core.listener.OnClickFloatingMenu;
+import org.smartregister.chw.core.utils.CoreConstants;
+import org.smartregister.chw.core.utils.CoreJsonFormUtils;
+import org.smartregister.chw.core.utils.Utils;
+import org.smartregister.commonregistry.CommonPersonObject;
+import org.smartregister.commonregistry.CommonPersonObjectClient;
+import org.smartregister.family.util.Constants.JSON_FORM_EXTRA;
+import org.smartregister.family.util.JsonFormUtils;
+import org.smartregister.helper.ImageRenderHelper;
+import org.smartregister.opd.activity.BaseOpdFormActivity;
+import org.smartregister.opd.utils.OpdConstants;
+import org.smartregister.view.customcontrols.CustomFontTextView;
+
+import timber.log.Timber;
+
+import static org.smartregister.chw.core.utils.CoreReferralUtils.getCommonRepository;
+
+public abstract class CoreAllClientsMemberProfileActivity extends CoreFamilyOtherMemberProfileActivity implements OnClickFloatingMenu, CoreAllClientsMemberContract.View {
+    private RelativeLayout layoutFamilyHasRow;
+    private CustomFontTextView familyHeadTextView;
+    private CustomFontTextView careGiverTextView;
+
+    @Override
+    protected void onCreation() {
+        setIndependentClient(true);
+        setContentView(R.layout.activity_all_clients_member_profile);
+
+        Toolbar toolbar = findViewById(org.smartregister.family.R.id.family_toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle("");
+        }
+
+        appBarLayout = findViewById(org.smartregister.family.R.id.toolbar_appbarlayout);
+
+        imageRenderHelper = new ImageRenderHelper(this);
+
+        initializePresenter();
+
+        setupViews();
+    }
+
+
+    @Override
+    public void setFamilyServiceStatus(String status) {
+        layoutFamilyHasRow.setVisibility(View.GONE);
+    }
+
+    @Override
+    protected void setupViews() {
+        super.setupViews();
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        toolbarTitle.setText(getString(R.string.return_to_all_client));
+        layoutFamilyHasRow = findViewById(R.id.family_has_row);
+        familyHeadTextView = findViewById(R.id.family_head);
+        careGiverTextView = findViewById(R.id.primary_caregiver);
+    }
+
+    @Override
+    protected void onResumption() {
+        super.onResumption();
+        layoutFamilyHasRow.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void toggleFamilyHead(boolean show) {
+        familyHeadTextView.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void togglePrimaryCaregiver(boolean show) {
+        careGiverTextView.setVisibility(View.GONE);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
+        int itemId = item.getItemId();
+        if (itemId == R.id.action_location_info) {
+            JSONObject preFilledForm = CoreJsonFormUtils.getAutoPopulatedJsonEditFormString(
+                    CoreConstants.JSON_FORM.getFamilyDetailsRegister(), this,
+                    getFamilyRegistrationDetails(), Utils.metadata().familyRegister.updateEventType);
+            if (preFilledForm != null) startFormActivity(preFilledForm);
+            return true;
+        }
+        return true;
+    }
+
+
+    @NotNull
+    protected CommonPersonObjectClient getFamilyRegistrationDetails() {
+        //Update common person client object with all details from family register table
+        final CommonPersonObject personObject = getCommonRepository(Utils.metadata().familyRegister.tableName)
+                .findByBaseEntityId(familyBaseEntityId);
+        CommonPersonObjectClient commonPersonObjectClient = new CommonPersonObjectClient(personObject.getCaseId(),
+                personObject.getDetails(), "");
+        commonPersonObjectClient.setColumnmaps(personObject.getColumnmaps());
+        commonPersonObjectClient.setDetails(personObject.getDetails());
+        return commonPersonObjectClient;
+    }
+
+    @Override
+    public void startFormActivity(JSONObject jsonForm) {
+        Intent intent = new Intent(this, BaseOpdFormActivity.class);
+        intent.putExtra(OpdConstants.JSON_FORM_EXTRA.JSON, jsonForm.toString());
+        Form form = new Form();
+        form.setName(getString(R.string.update_client_registration));
+        form.setActionBarBackground(R.color.family_actionbar);
+        form.setNavigationBackground(R.color.family_navigation);
+        form.setHomeAsUpIndicator(R.mipmap.ic_cross_white);
+        form.setPreviousLabel(getResources().getString(R.string.back));
+        form.setWizard(false);
+        intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, form);
+        startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) return;
+        try {
+            String jsonString = data.getStringExtra(JSON_FORM_EXTRA.JSON);
+            JSONObject form = new JSONObject(jsonString);
+            if (form.getString(JsonFormUtils.ENCOUNTER_TYPE).equals(Utils.metadata().familyRegister.updateEventType)) {
+                getAllClientsMemberPresenter().updateLocationInfo(jsonString, familyBaseEntityId);
+            }
+        } catch (Exception e) {
+            Timber.e(e);
+        }
+    }
+
+    @Override
+    protected void setIndependentClient(boolean isIndependentClient) {
+        super.isIndependent = isIndependentClient;
+    }
+
+}