diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java index ae5d0e7..4f3151c 100644 --- a/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java +++ b/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java @@ -24,7 +24,7 @@ public class LicenceModel { int saison; - boolean certificate; + String certificate; boolean validate; } diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java index 8bbccc4..64fb1ab 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java @@ -54,7 +54,7 @@ public class LicenceService { LicenceModel model = new LicenceModel(); model.setMembre(membreModel); model.setSaison(form.getSaison()); - model.setCertificate(form.isCertificate()); + model.setCertificate(form.getCertificate()); model.setValidate(form.isValidate()); return Panache.withTransaction(() -> repository.persist(model) .call(m -> (m.isValidate() && membreModel.getLicence() <= 0) ? @@ -66,7 +66,7 @@ public class LicenceService { }); } else { return repository.findById(form.getId()).chain(model -> { - model.setCertificate(form.isCertificate()); + model.setCertificate(form.getCertificate()); model.setValidate(form.isValidate()); return Panache.withTransaction(() -> repository.persist(model) .call(m -> m.isValidate() ? Mutiny.fetch(m.getMembre()) @@ -96,13 +96,13 @@ public class LicenceService { LicenceModel model = new LicenceModel(); model.setMembre(combRepository); model.setSaison(Utils.getSaison()); - model.setCertificate(form.isCertificate()); + model.setCertificate(form.getCertificate()); model.setValidate(false); return Panache.withTransaction(() -> repository.persist(model)); })); } else { return repository.findById(form.getId()).chain(model -> { - model.setCertificate(form.isCertificate()); + model.setCertificate(form.getCertificate()); return Panache.withTransaction(() -> repository.persist(model)); }); } diff --git a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java index c9fedce..8714d1f 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java @@ -14,7 +14,7 @@ public class SimpleLicence { Long id; Long membre; int saison; - boolean certificate; + String certificate; boolean validate; public static SimpleLicence fromModel(LicenceModel model) { @@ -25,7 +25,7 @@ public class SimpleLicence { .id(model.getId()) .membre(model.getMembre().getId()) .saison(model.getSaison()) - .certificate(model.isCertificate()) + .certificate(model.getCertificate()) .validate(model.isValidate()) .build(); } diff --git a/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java b/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java index 678acc7..d587e34 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java @@ -17,7 +17,7 @@ public class LicenceForm { private int saison; @FormParam("certificate") - private boolean certificate; + private String certificate = null; @FormParam("validate") private boolean validate; diff --git a/src/main/webapp/src/App.jsx b/src/main/webapp/src/App.jsx index aeee804..85662c9 100644 --- a/src/main/webapp/src/App.jsx +++ b/src/main/webapp/src/App.jsx @@ -95,7 +95,7 @@ function Root() {