Fix Issue openMF#891:Empty space when no staff associated and No exte…

…rnal ID in groups
iamsh4shank · Jun 18, 2020 · 6dab7f4 · 6dab7f4
1 parent 1aefe13
commit 6dab7f4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...droid/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsFragment.java b/...droid/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsFragment.java
@@ -144,7 +144,11 @@ public void showProgressbar(boolean show) {
     public void showCenterDetails(CenterWithAssociations centerWithAssociations) {
         setToolbarTitle(centerWithAssociations.getName());
         if (!centerWithAssociations.getActivationDate().isEmpty()) {
-            tvStaffName.setText(centerWithAssociations.getStaffName());
+            if (centerWithAssociations.getStaffName() != null) {
+                tvStaffName.setText(centerWithAssociations.getStaffName());
+            } else {
+                tvStaffName.setText(R.string.no_staff);
+            }
             tvActivationDate.setText(Utils.getStringOfDate
                     (centerWithAssociations.getActivationDate()));
         }

diff --git a/...android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.java b/...android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.java
@@ -217,7 +217,11 @@ public void showGroup(Group group) {
             }
             setToolbarTitle(getString(R.string.group) + " - " + group.getName());
             tv_fullName.setText(group.getName());
-            tv_externalId.setText(group.getExternalId());
+            if (group.getExternalId() != null) {
+                tv_externalId.setText(group.getExternalId());
+            } else {
+                tv_externalId.setText(R.string.not_available);
+            }
 
             try {
                 String dateString = Utils.getStringOfDate(group.getActivationDate());

diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
@@ -755,6 +755,7 @@
     <string name="surveyEmpty">This Survey is Empty</string>
     <string name="centerList_account_prefix">Account No: %1$s</string>
     <string name="no_staff">no staff</string>
+    <string name="not_available">N.A</string>
     <string name="note">Notes</string>
     <string name="empty_notes">Empty Notes</string>
     <string name="failed_to_fetch_notes">Failed to Fetch Notes</string>