|
28 | 28 | import androidx.recyclerview.widget.LinearLayoutManager; |
29 | 29 | import android.widget.SimpleAdapter; |
30 | 30 | import android.widget.TextView; |
| 31 | +import android.widget.Toast; |
31 | 32 |
|
32 | 33 | import androidx.annotation.Nullable; |
33 | 34 | import androidx.annotation.StringRes; |
@@ -790,23 +791,49 @@ private void loadFamilyMembers(String familyUuid) { |
790 | 791 |
|
791 | 792 | private void showSubFamilyMembers(PolygamousSubFamily subFamily) { |
792 | 793 | try { |
793 | | - if (subFamily == null) { |
| 794 | + if (subFamily == null || subFamily.getChfId() == null) { |
| 795 | + Log.e(LOG_TAG, "Sous-famille ou ID CHF manquant"); |
794 | 796 | return; |
795 | 797 | } |
796 | 798 |
|
797 | | - PolygamousSubFamily safeCopy = createSafeCopy(subFamily); |
798 | | - |
799 | 799 | Intent intent = new Intent(this, SubHouseholdActivity.class); |
800 | | - intent.putExtra(SubHouseholdActivity.EXTRA_SUB_HEAD, safeCopy); |
801 | | - |
802 | | - if (safeCopy.getMembers() != null) { |
803 | | - ArrayList<FamilyMember> allMembers = new ArrayList<>(safeCopy.getMembers()); |
804 | | - intent.putExtra(SubHouseholdActivity.EXTRA_ALL_MEMBERS, allMembers); |
| 800 | + // Transmission de toutes les informations disponibles du chef de sous-famille |
| 801 | + intent.putExtra(SubHouseholdActivity.EXTRA_CHF_ID, subFamily.getChfId()); |
| 802 | + |
| 803 | + // Ajout des informations personnelles |
| 804 | + if (subFamily.getLastName() != null) { |
| 805 | + intent.putExtra("EXTRA_LAST_NAME", subFamily.getLastName()); |
| 806 | + } |
| 807 | + if (subFamily.getOtherNames() != null) { |
| 808 | + intent.putExtra("EXTRA_OTHER_NAMES", subFamily.getOtherNames()); |
| 809 | + } |
| 810 | + if (subFamily.getGender() != null) { |
| 811 | + intent.putExtra("EXTRA_GENDER", subFamily.getGender()); |
| 812 | + } |
| 813 | + if (subFamily.getDob() != null) { |
| 814 | + intent.putExtra("EXTRA_DOB", subFamily.getDob()); |
805 | 815 | } |
| 816 | + if (subFamily.getPhoto() != null) { |
| 817 | + intent.putExtra("EXTRA_PHOTO_PATH", subFamily.getPhoto()); |
| 818 | + } |
| 819 | + |
| 820 | + // Si un UUID de famille est disponible, on l'ajoute aux extras |
| 821 | + if (subFamily.getFamilyUuid() != null) { |
| 822 | + intent.putExtra(SubHouseholdActivity.EXTRA_FAMILY_UUID, subFamily.getFamilyUuid()); |
| 823 | + } |
| 824 | + |
| 825 | + Log.d(LOG_TAG, "📤 Transmission des données vers SubHouseholdActivity:"); |
| 826 | + Log.d(LOG_TAG, " - CHFID: '" + subFamily.getChfId() + "'"); |
| 827 | + Log.d(LOG_TAG, " - LastName: '" + subFamily.getLastName() + "'"); |
| 828 | + Log.d(LOG_TAG, " - OtherNames: '" + subFamily.getOtherNames() + "'"); |
| 829 | + Log.d(LOG_TAG, " - Gender: '" + subFamily.getGender() + "'"); |
| 830 | + Log.d(LOG_TAG, " - DOB: '" + subFamily.getDob() + "'"); |
| 831 | + Log.d(LOG_TAG, " - FamilyUuid: '" + subFamily.getFamilyUuid() + "'"); |
806 | 832 |
|
807 | 833 | startActivity(intent); |
808 | 834 | } catch (Exception e) { |
809 | | - |
| 835 | + Log.e(LOG_TAG, "Erreur dans showSubFamilyMembers", e); |
| 836 | + Toast.makeText(this, "Erreur lors de l'affichage des détails de la famille", Toast.LENGTH_SHORT).show(); |
810 | 837 | } |
811 | 838 | } |
812 | 839 |
|
|
0 commit comments