diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/CompetitionGuestModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/CompetitionGuestModel.java index fae3a91..2228f83 100644 --- a/src/main/java/fr/titionfire/ffsaf/data/model/CompetitionGuestModel.java +++ b/src/main/java/fr/titionfire/ffsaf/data/model/CompetitionGuestModel.java @@ -43,8 +43,8 @@ public class CompetitionGuestModel implements CombModel { String country = "fr"; - Integer weight = null; - Integer weightReal = null; + Float weight = null; + Float weightReal = null; @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST) @JoinTable( @@ -109,7 +109,7 @@ public class CompetitionGuestModel implements CombModel { return Stream.concat(comb.stream(), guest.stream()).anyMatch(c -> Objects.equals(c, comb_)); } - public Integer getWeight2() { + public Float getWeight2() { return (this.weightReal != null) ? this.weightReal : this.weight; } } diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/RegisterModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/RegisterModel.java index 75c03bd..8a3680c 100644 --- a/src/main/java/fr/titionfire/ffsaf/data/model/RegisterModel.java +++ b/src/main/java/fr/titionfire/ffsaf/data/model/RegisterModel.java @@ -37,8 +37,8 @@ public class RegisterModel { @JoinColumn(name = "id_membre") MembreModel membre; - Integer weight; - Integer weightReal; + Float weight; + Float weightReal; int overCategory = 0; Categorie categorie; @@ -61,7 +61,7 @@ public class RegisterModel { ) List categoriesInscrites = new ArrayList<>(); - public RegisterModel(CompetitionModel competition, MembreModel membre, Integer weight, int overCategory, + public RegisterModel(CompetitionModel competition, MembreModel membre, Float weight, int overCategory, Categorie categorie, ClubModel club) { this.id = new RegisterId(competition.getId(), membre.getId()); this.competition = competition; @@ -91,7 +91,7 @@ public class RegisterModel { return Categorie.values()[Math.min(tmp.ordinal() + this.overCategory, Categorie.values().length - 1)]; } - public Integer getWeight2() { + public Float getWeight2() { if (weightReal != null) return weightReal; return weight; diff --git a/src/main/java/fr/titionfire/ffsaf/domain/entity/CombEntity.java b/src/main/java/fr/titionfire/ffsaf/domain/entity/CombEntity.java index e0da444..408ca4d 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/entity/CombEntity.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/entity/CombEntity.java @@ -27,7 +27,7 @@ public class CombEntity { Genre genre; String country; int overCategory; - Integer weight; + Float weight; List teamMembers; List categoriesInscrites; diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/CompetitionData.java b/src/main/java/fr/titionfire/ffsaf/rest/data/CompetitionData.java index df37ffe..82f08e2 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/CompetitionData.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/CompetitionData.java @@ -107,7 +107,7 @@ public class CompetitionData { public static class SimpleRegister { long id; int overCategory; - Integer weight; + Float weight; Categorie categorie; Long club; String club_str; diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/RegisterRequestData.java b/src/main/java/fr/titionfire/ffsaf/rest/data/RegisterRequestData.java index 93d20e5..0cf467a 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/RegisterRequestData.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/RegisterRequestData.java @@ -18,8 +18,8 @@ public class RegisterRequestData { private String fname; private String lname; - private Integer weight; - private Integer weightReal; + private Float weight; + private Float weightReal; private Integer overCategory; private boolean lockEdit = false; private List categoriesInscrites; diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleRegisterComb.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleRegisterComb.java index 0dd5799..7f145ee 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleRegisterComb.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleRegisterComb.java @@ -26,8 +26,8 @@ public class SimpleRegisterComb { private Categorie categorie; private SimpleClubModel club; private Integer licence; - private Integer weight; - private Integer weightReal; + private Float weight; + private Float weightReal; private int overCategory; private boolean hasLicenceActive; private boolean lockEdit; diff --git a/src/main/java/fr/titionfire/ffsaf/ws/recv/RTeam.java b/src/main/java/fr/titionfire/ffsaf/ws/recv/RTeam.java index 54015fd..97d6ee5 100644 --- a/src/main/java/fr/titionfire/ffsaf/ws/recv/RTeam.java +++ b/src/main/java/fr/titionfire/ffsaf/ws/recv/RTeam.java @@ -86,7 +86,7 @@ public class RTeam { .max(Integer::compareTo) .map(i -> Categorie.values()[i]).orElse(Categorie.SENIOR1)); - List s = Stream.concat( + List s = Stream.concat( pair.getKey().stream().map(RegisterModel::getWeight), pair.getValue().stream().map(CompetitionGuestModel::getWeight)) .filter(Objects::nonNull).toList(); @@ -95,7 +95,7 @@ public class RTeam { } else if (s.size() == 1) { team.setWeight(s.get(0)); } else { - team.setWeight((int) s.stream().mapToInt(Integer::intValue) + team.setWeight((float) s.stream().mapToDouble(Float::doubleValue) .average() .orElse(0)); } diff --git a/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx b/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx index d018190..e8f6b9d 100644 --- a/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx +++ b/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx @@ -554,11 +554,11 @@ function Modal_({data2, data3, error2, sendRegister, modalState, setModalState,
{t('comp.modal.poids')} {source === "admin" && {t('comp.modal.annoncé')}} - setWeight(e.target.value)}/> {source === "admin" && <>{t('comp.modal.pesé')} - setWeightReal(e.target.value)}/>}
diff --git a/src/main/webapp/src/pages/competition/CompetitionView.jsx b/src/main/webapp/src/pages/competition/CompetitionView.jsx index d055e5b..0caceb9 100644 --- a/src/main/webapp/src/pages/competition/CompetitionView.jsx +++ b/src/main/webapp/src/pages/competition/CompetitionView.jsx @@ -156,11 +156,11 @@ function SelfRegister({data2}) {

{t('comp.monInscription')}