Data Table Deletion Completed

openMF · Aug 12, 2014 · 37c4873 · 37c4873
1 parent a3a2df2
commit 37c4873
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/ClientDetailsFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/ClientDetailsFragment.java
@@ -349,7 +349,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     = DataTableDataFragment.newInstance(clientDataTables.get(id), clientId);
             FragmentTransaction fragmentTransaction = getActivity().getSupportFragmentManager().beginTransaction();
             fragmentTransaction.addToBackStack(FragmentConstants.FRAG_CLIENT_DETAILS);
-            fragmentTransaction.replace(R.id.global_container, dataTableDataFragment);
+            fragmentTransaction.replace(R.id.global_container, dataTableDataFragment, FragmentConstants.FRAG_DATA_TABLE);
+
             fragmentTransaction.commit();
         } else if (id == MENU_ITEM_DOCUMENTS) {
 

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DataTableDataFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DataTableDataFragment.java
@@ -151,7 +151,9 @@ public void inflateView() {
             public void success(JsonArray jsonElements, Response response) {
 
                 if (jsonElements != null) {
-                    linearLayout = DataTableUIBuilder.getDataTableLayout(dataTable, jsonElements, linearLayout, getActivity(), entityId, (DataTableUIBuilder.DataTableActionListener)getParentFragment());
+                    linearLayout.invalidate();
+                    DataTableUIBuilder.DataTableActionListener mListener = (DataTableUIBuilder.DataTableActionListener) getActivity().getSupportFragmentManager().findFragmentByTag(FragmentConstants.FRAG_DATA_TABLE);
+                    linearLayout = new DataTableUIBuilder().getDataTableLayout(dataTable, jsonElements, linearLayout, getActivity(), entityId, mListener);
                 }
             }
 

diff --git a/mifosng-android/src/main/java/com/mifos/utils/DataTableUIBuilder.java b/mifosng-android/src/main/java/com/mifos/utils/DataTableUIBuilder.java
@@ -39,23 +39,22 @@
  */
 public class DataTableUIBuilder {
 
-    static int tableIndex;
-    static DataTableActionListener dataTableActionListener;
+    int tableIndex;
+    private DataTableActionListener dataTableActionListener;
 
-    public static LinearLayout getDataTableLayout(final DataTable dataTable,
+    public LinearLayout getDataTableLayout(final DataTable dataTable,
                                                   JsonArray jsonElements,
                                                   LinearLayout parentLayout,
                                                   final Context context,
                                                   final int entityId,
                                                   DataTableActionListener mListener){
-
+        dataTableActionListener = mListener;
         Log.i("Number of Column Headers", "" + dataTable.getColumnHeaderData().size());
         /**
          * Create a Iterator with Json Elements to Iterate over the DataTable
          * Response.
          */
         Iterator<JsonElement> jsonElementIterator = jsonElements.iterator();
-        dataTableActionListener = mListener;
         /*
          * Each Row of the Data Table is Treated as a Table Here.
          * Creating the First Table for First Row
@@ -139,7 +138,7 @@ public void failure(RetrofitError retrofitError) {
                             }
                     );
 
-                    return false;
+                    return true;
                 }
             });
 

diff --git a/mifosng-android/src/main/java/com/mifos/utils/FragmentConstants.java b/mifosng-android/src/main/java/com/mifos/utils/FragmentConstants.java
@@ -26,4 +26,6 @@ public class FragmentConstants {
 
     public static final String FRAG_CLIENT_SEARCH = "Client Search Fragment";
     public static final String DFRAG_DATATABLE_ENTRY_FORM = "Data_Table_Entry_Form";
+
+    public static final String FRAG_DATA_TABLE = "Data Table Fragment";
 }