From 4bcb72ebecb0c9e028f6d320a197ea8cf8fa5d28 Mon Sep 17 00:00:00 2001 From: Thibaut Valentin Date: Fri, 7 Feb 2025 12:52:34 +0100 Subject: [PATCH] fix(membre): fix null licence number case --- .../java/fr/titionfire/ffsaf/domain/entity/MembreEntity.java | 2 +- src/main/java/fr/titionfire/ffsaf/rest/data/SimpleMembre.java | 2 +- src/main/webapp/src/pages/MemberList.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/titionfire/ffsaf/domain/entity/MembreEntity.java b/src/main/java/fr/titionfire/ffsaf/domain/entity/MembreEntity.java index 04805ee..f979fb4 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/entity/MembreEntity.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/entity/MembreEntity.java @@ -23,7 +23,7 @@ public class MembreEntity { private Categorie categorie; private ClubEntity club; private Genre genre; - private int licence; + private Integer licence; private String country; private Date birth_date; private String email; diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleMembre.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleMembre.java index a7e228b..f2cf3fe 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleMembre.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleMembre.java @@ -34,7 +34,7 @@ public class SimpleMembre { @Schema(description = "Le genre du membre.", example = "H") private Genre genre; @Schema(description = "Le numéro de licence du membre.", example = "12345") - private int licence; + private Integer licence; @Schema(description = "Le pays du membre.", example = "FR") private String country; @Schema(description = "La date de naissance du membre.") diff --git a/src/main/webapp/src/pages/MemberList.jsx b/src/main/webapp/src/pages/MemberList.jsx index 9e2c63f..bb91ef0 100644 --- a/src/main/webapp/src/pages/MemberList.jsx +++ b/src/main/webapp/src/pages/MemberList.jsx @@ -139,7 +139,7 @@ function MakeCentralPanel({data, visibleMember, navigate, showLicenceState, page function MakeRow({member, showLicenceState, navigate, source}) { const rowContent = <>
- {String(member.licence_number).padStart(5, '0')} + {member.licence_number ? String(member.licence_number).padStart(5, '0') : "-------"}
{member.fname} {member.lname}