Skip to content

Commit 98f9382

Browse files
update
1 parent 803a47f commit 98f9382

9 files changed

Lines changed: 950 additions & 120 deletions

File tree

claimManagement/src/main/java/org/openimis/imisclaims/EnquireActivity.java

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import androidx.recyclerview.widget.LinearLayoutManager;
2929
import android.widget.SimpleAdapter;
3030
import android.widget.TextView;
31+
import android.widget.Toast;
3132

3233
import androidx.annotation.Nullable;
3334
import androidx.annotation.StringRes;
@@ -790,23 +791,49 @@ private void loadFamilyMembers(String familyUuid) {
790791

791792
private void showSubFamilyMembers(PolygamousSubFamily subFamily) {
792793
try {
793-
if (subFamily == null) {
794+
if (subFamily == null || subFamily.getChfId() == null) {
795+
Log.e(LOG_TAG, "Sous-famille ou ID CHF manquant");
794796
return;
795797
}
796798

797-
PolygamousSubFamily safeCopy = createSafeCopy(subFamily);
798-
799799
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());
805815
}
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() + "'");
806832

807833
startActivity(intent);
808834
} 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();
810837
}
811838
}
812839

0 commit comments

Comments
 (0)