GA is hidden if the its past 40 weeks

opensrp · Jan 25, 2022 · b9a8dd0 · b9a8dd0
1 parent 532d842
commit b9a8dd0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/presenter/ProfilePresenter.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/presenter/ProfilePresenter.java
@@ -142,9 +142,12 @@ public void refreshProfileTopSection(Map<String, String> client) {
                     .setProfileName(client.get(DBConstantsUtils.KeyUtils.FIRST_NAME) + " " + client.get(DBConstantsUtils.KeyUtils.LAST_NAME));
             getProfileView().setProfileAge(String.valueOf(Utils.getAgeFromDate(client.get(DBConstantsUtils.KeyUtils.DOB))));
             try {
-                getProfileView().setProfileGestationAge(
-                        client.containsKey(DBConstantsUtils.KeyUtils.EDD) && client.get(DBConstantsUtils.KeyUtils.EDD) != null ?
-                                String.valueOf(Utils.getGestationAgeFromEDDate(client.get(DBConstantsUtils.KeyUtils.EDD))) : null);
+                if(client.containsKey(DBConstantsUtils.KeyUtils.EDD) && client.get(DBConstantsUtils.KeyUtils.EDD) != null)
+                    if(Utils.getGestationAgeFromEDDate(client.get(DBConstantsUtils.KeyUtils.EDD)) <= 40) {
+                        getProfileView().setProfileGestationAge(
+                                String.valueOf(Utils.getGestationAgeFromEDDate(client.get(DBConstantsUtils.KeyUtils.EDD))));
+                    }
+
             } catch (Exception e) {
                 getProfileView().setProfileGestationAge("0");
             }

diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/AdvancedSearchProvider.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/AdvancedSearchProvider.java
@@ -174,7 +174,13 @@ private void populatePatientColumn(CommonPersonObjectClient pc, SmartRegisterCli
 
         if(!StringUtils.isBlank(edd))
         {
-            fillValue(viewHolder.ga,String.format(context.getString(R.string.ga_text), Utils.getGestationAgeFromEDDate(edd)));
+            if(Utils.getGestationAgeFromEDDate(edd) <= 40) {
+                fillValue(viewHolder.ga, String.format(context.getString(R.string.ga_text), Utils.getGestationAgeFromEDDate(edd)));
+            }
+            else
+            {
+                fillValue(viewHolder.ga,"");
+            }
         }
         else
             fillValue(viewHolder.ga,"");

diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/RegisterProvider.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/RegisterProvider.java
@@ -139,9 +139,15 @@ private void populatePatientColumn(CommonPersonObjectClient pc, SmartRegisterCli
         String edd = Utils.getValue(pc.getColumnmaps(), DBConstantsUtils.KeyUtils.EDD, false);
 
         if (StringUtils.isNotBlank(edd)) {
-            fillValue((viewHolder.ga),
-                    String.format(context.getString(R.string.ga_text), Utils.getGestationAgeFromEDDate(edd)));
-            viewHolder.period.setVisibility(View.VISIBLE);
+            if(Utils.getGestationAgeFromEDDate(edd) > 40)
+            {
+                fillValue(viewHolder.ga, "");
+            }
+            else {
+                fillValue((viewHolder.ga),
+                        String.format(context.getString(R.string.ga_text), Utils.getGestationAgeFromEDDate(edd)));
+                viewHolder.period.setVisibility(View.VISIBLE);
+            }
         } else {
 
             fillValue((viewHolder.ga), "");