Merge branch '#19-implement-top-right-menu-malaria-profile' into apk-…

…release1
opensrp · Jul 4, 2019 · f6ba3d6 · f6ba3d6
2 parents faa8805 + b5149ef
commit f6ba3d6
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 7 deletions.
diff --git a/opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/domain/MemberObject.java b/opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/domain/MemberObject.java
@@ -13,15 +13,25 @@ public class MemberObject implements Serializable {
     private String gender;
     private String uniqueId;
     private String age;
+    private String baseEntityId;
+    private String relationalId;
+    private String primaryCareGiver;
+    private String familyHead;
+    private String familyBaseEntityId;
 
     public MemberObject(CommonPersonObjectClient client) {
-        firstName = client.getColumnmaps().get(DBConstants.KEY.FIRST_NAME);
-        middleName = client.getColumnmaps().get(DBConstants.KEY.MIDDLE_NAME);
-        lastName = client.getColumnmaps().get(DBConstants.KEY.LAST_NAME);
-        address = client.getColumnmaps().get(DBConstants.KEY.VILLAGE_TOWN);
-        gender = client.getColumnmaps().get(DBConstants.KEY.GENDER);
+        firstName = client.getColumnmaps().get(DBConstants.KEY.FIRST_NAME) != null ? client.getColumnmaps().get(DBConstants.KEY.FIRST_NAME) : "";
+        middleName = client.getColumnmaps().get(DBConstants.KEY.MIDDLE_NAME) != null ? client.getColumnmaps().get(DBConstants.KEY.MIDDLE_NAME) : "";
+        lastName = client.getColumnmaps().get(DBConstants.KEY.LAST_NAME) != null ? client.getColumnmaps().get(DBConstants.KEY.LAST_NAME) : "";
+        address = client.getColumnmaps().get(DBConstants.KEY.VILLAGE_TOWN) != null ? client.getColumnmaps().get(DBConstants.KEY.VILLAGE_TOWN) : "";
+        gender = client.getColumnmaps().get(DBConstants.KEY.GENDER) != null ? client.getColumnmaps().get(DBConstants.KEY.GENDER) : "";
+        age = client.getColumnmaps().get(DBConstants.KEY.DOB) != null ? client.getColumnmaps().get(DBConstants.KEY.DOB) : "";
         uniqueId = client.getColumnmaps().get(DBConstants.KEY.UNIQUE_ID);
-        age = client.getColumnmaps().get(DBConstants.KEY.DOB);
+        baseEntityId = client.getColumnmaps().get(DBConstants.KEY.BASE_ENTITY_ID);
+        relationalId = client.getColumnmaps().get(DBConstants.KEY.RELATIONAL_ID);
+        primaryCareGiver = client.getColumnmaps().get(DBConstants.KEY.PRIMARY_CARE_GIVER);
+        familyHead = client.getColumnmaps().get(DBConstants.KEY.FAMILY_HEAD);
+        familyBaseEntityId = client.getColumnmaps().get(DBConstants.KEY.FAMILY_BASE_ENTITY_ID);
     }
     public String getFirstName() {
         return firstName;
@@ -79,6 +89,46 @@ public void setUniqueId(String uniqueId) {
         this.uniqueId = uniqueId;
     }
 
+    public String getBaseEntityId() {
+        return baseEntityId;
+    }
+
+    public void setBaseEntityId(String baseEntityId) {
+        this.baseEntityId = baseEntityId;
+    }
+
+    public String getRelationalId() {
+        return relationalId;
+    }
+
+    public void setRelationalId(String relationalId) {
+        this.relationalId = relationalId;
+    }
+
+    public String getFamilyBaseEntityId() {
+        return familyBaseEntityId;
+    }
+
+    public void setFamilyBaseEntityId(String familyBaseEntityId) {
+        this.familyBaseEntityId = familyBaseEntityId;
+    }
+
+    public String getPrimaryCareGiver() {
+        return primaryCareGiver;
+    }
+
+    public void setPrimaryCareGiver(String primaryCareGiver) {
+        this.primaryCareGiver = primaryCareGiver;
+    }
+
+    public String getFamilyHead() {
+        return familyHead;
+    }
+
+    public void setFamilyHead(String familyHead) {
+        this.familyHead = familyHead;
+    }
+
 
 
 }
diff --git a/opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/util/Constants.java b/opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/util/Constants.java
@@ -14,10 +14,11 @@ interface JSON_FORM_EXTRA {
 
     interface EVENT_TYPE {
         String MALARIA_CONFIRMATION = "Malaria Confirmation";
+        String UPDATE_MALARIA_CONFIRMATION  = "update malaria confirmation";
     }
 
     interface FORMS {
-        String MALARIA_REGISTRATION = "malaria_registration";
+        String MALARIA_REGISTRATION = "malaria_confirmation";
     }
 
     interface TABLES {

diff --git a/opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/util/DBConstants.java b/opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/util/DBConstants.java
@@ -10,12 +10,16 @@ public final class KEY {
         public static final String MIDDLE_NAME = "middle_name";
         public static final String LAST_NAME = "last_name";
         public static final String BASE_ENTITY_ID = "base_entity_id";
+        public static final String FAMILY_BASE_ENTITY_ID = "family_base_entity_id";
         public static final String DOB = "dob";//Date Of Birth
         public static final String DOD = "dod";
         public static final String UNIQUE_ID = "unique_id";
         public static final String LAST_INTERACTED_WITH = "last_interacted_with";
         public static final String VILLAGE_TOWN = "village_town";
         public static final String DATE_REMOVED = "date_removed";
         public static final String GENDER = "gender";
+        public static final String RELATIONAL_ID = "relational_id";
+        public static final String FAMILY_HEAD = "family_head";
+        public static final String PRIMARY_CARE_GIVER = "primary_caregiver";
     }
 }