end add and delete process

vaneck237 · vaneck237 · commit cc3ae9077235 · 2026-03-29T23:29:17.000+01:00
diff --git a/app/src/main/java/org/openimis/imispolicies/InsureeActivity.java b/app/src/main/java/org/openimis/imispolicies/InsureeActivity.java
@@ -14,6 +14,8 @@
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.card.MaterialCardView;
@@ -1182,6 +1184,17 @@ public void saveFormData() {
                     startActivity(intent);
                     finish();
                 }
+            } else if(insureeId == 0){
+                // ajout d'un membre
+                int ans = ca.SaveInsuree(insureeObject.toString(),familyId, isHead, 0, 0);
+                if(ans!=0 && ans != 7){
+                    FragmentActivity activity = (FragmentActivity) this;
+                    FragmentManager fm = activity.getSupportFragmentManager();
+                    Bundle result = new Bundle();
+                    result.putBoolean("refresh_insurees", true);
+                    fm.setFragmentResult("requestKey", result);
+                    finish();
+                }
             } else {
                 // modification d'un assuré
                 String FamilyPolicy = ca.getFamilyPolicy(familyId);
@@ -1216,6 +1229,8 @@ public void saveFormData() {
 
         } catch (JSONException e) {
             throw new RuntimeException(e);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/app/src/main/java/org/openimis/imispolicies/InsureeAdapter.java b/app/src/main/java/org/openimis/imispolicies/InsureeAdapter.java
@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +15,8 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.card.MaterialCardView;
@@ -124,17 +127,21 @@ public void onClick(DialogInterface dialogInterface, int i) {
                                         deleteSuccess = ca.DeleteInsuree(insureeId);
                                     }
                                     if (deleteSuccess == 1) {
-                                        ca.ShowDialog(context.getResources().getString(R.string.InsureeDeleted));
                                         dialogInterface.dismiss();
-                                        Intent intent = new Intent(context, FamilyInsurees.class);
-                                        intent.putExtra("FamilyId", familyId);
-                                        context.startActivity(intent);
-                                        ((Activity) context).finish();
+                                        progressDialog.dismiss();
+                                        FragmentActivity activity = (FragmentActivity) context;
+                                        FragmentManager fm = activity.getSupportFragmentManager();
+                                        Bundle result = new Bundle();
+                                        result.putBoolean("refresh_insurees", true);
+                                        fm.setFragmentResult("requestKey", result);
+                                        ca.ShowDialog(context.getResources().getString(R.string.InsureeDeleted));
                                     } else if(deleteSuccess == 2){
                                         dialogInterface.dismiss();
+                                        progressDialog.dismiss();
                                         ca.ShowDialog(context.getResources().getString(R.string.IsHeadDelete));
                                     } else if(deleteSuccess == -1){
                                         dialogInterface.dismiss();
+                                        progressDialog.dismiss();
                                         ca.ShowDialog(context.getResources().getString(R.string.LoginToDeleteOnlineData));
                                     } else {
                                         dialogInterface.dismiss();
diff --git a/app/src/main/java/org/openimis/imispolicies/InsureesFragment.java b/app/src/main/java/org/openimis/imispolicies/InsureesFragment.java
@@ -28,6 +28,12 @@ public InsureesFragment(){}
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.insurees_fragment, container, false);
+        getParentFragmentManager().setFragmentResultListener("requestKey", this, (requestKey, bundle) -> {
+            boolean refresh = bundle.getBoolean("refresh_insurees");
+            if (refresh) {
+                LoadInsurees();
+            }
+        });
         btnAddInsuree = view.findViewById(R.id.btnNewInsuree);
         recyclerInsurees = view.findViewById(R.id.recyclerInsurees);
         ca = new ClientAndroidInterface(getActivity());
diff --git a/app/src/main/java/org/openimis/imispolicies/PoliciesFragment.java b/app/src/main/java/org/openimis/imispolicies/PoliciesFragment.java
@@ -31,7 +31,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.policies_fragment, container, false);
         getParentFragmentManager().setFragmentResultListener("requestKey", this, (requestKey, bundle) -> {
-            boolean refresh = bundle.getBoolean("refresh");
+            boolean refresh = bundle.getBoolean("refresh_policies");
             if (refresh) {
                 loadPolicies();
             }
diff --git a/app/src/main/java/org/openimis/imispolicies/PolicyActivity.java b/app/src/main/java/org/openimis/imispolicies/PolicyActivity.java
@@ -245,7 +245,7 @@ private void savePolicy(){
                 FragmentActivity activity = (FragmentActivity) this;
                 FragmentManager fm = activity.getSupportFragmentManager();
                 Bundle result = new Bundle();
-                result.putBoolean("refresh", true);
+                result.putBoolean("refresh_policies", true);
                 fm.setFragmentResult("requestKey", result);
                 finish();
             }
diff --git a/app/src/main/java/org/openimis/imispolicies/PolicyAdapter.java b/app/src/main/java/org/openimis/imispolicies/PolicyAdapter.java
@@ -134,7 +134,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                                         dialogInterface.dismiss();
                                         progressDialog.dismiss();
                                         Bundle result = new Bundle();
-                                        result.putBoolean("refresh", true);
+                                        result.putBoolean("refresh_policies", true);
                                         fm.setFragmentResult("requestKey", result);
                                         ca.ShowDialog(context.getResources().getString(R.string.PolicyDeleted));
                                     } else if(deleteSuccess == -1){

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,`
`31`	`31`	`Bundle savedInstanceState) {`
`32`	`32`	`View view = inflater.inflate(R.layout.policies_fragment, container, false);`
`33`	`33`	`getParentFragmentManager().setFragmentResultListener("requestKey", this, (requestKey, bundle) -> {`
`34`		`- boolean refresh = bundle.getBoolean("refresh");`
	`34`	`+ boolean refresh = bundle.getBoolean("refresh_policies");`
`35`	`35`	`if (refresh) {`
`36`	`36`	`loadPolicies();`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ private void savePolicy(){`
`245`	`245`	`FragmentActivity activity = (FragmentActivity) this;`
`246`	`246`	`FragmentManager fm = activity.getSupportFragmentManager();`
`247`	`247`	`Bundle result = new Bundle();`
`248`		`- result.putBoolean("refresh", true);`
	`248`	`+ result.putBoolean("refresh_policies", true);`
`249`	`249`	`fm.setFragmentResult("requestKey", result);`
`250`	`250`	`finish();`
`251`	`251`	`}`