Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Merge pull request 'dev' (#50) from dev into master

Browse Source 
Reviewed-on: #50
This commit is contained in:
Thibaut Valentin 2025-08-15 19:49:13 +00:00
commit 1908de681e
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java
View File

@ -261,7 +261,8 @@ public class AffiliationService {
}) })
.call(m -> ((m.getUserId() == null) ? keycloakService.initCompte(m.getId()) : .call(m -> ((m.getUserId() == null) ? keycloakService.initCompte(m.getId()) :
keycloakService.setClubGroupMembre(m, club).map(__ -> m.getUserId())) keycloakService.setClubGroupMembre(m, club).map(__ -> m.getUserId()))
.call(userId -> keycloakService.setAutoRoleMembre(userId, m.getRole(), m.getGrade_arbitrage()))) .call(userId -> keycloakService.setAutoRoleMembre(userId, m.getRole(), m.getGrade_arbitrage()))
.call(userId -> keycloakService.setEmail(userId, m.getEmail())))
.call(m -> Mutiny.fetch(m.getLicences()) .call(m -> Mutiny.fetch(m.getLicences())
.call(l1 -> l1 != null && l1.stream().anyMatch(l -> l.getSaison() == saison) ? .call(l1 -> l1 != null && l1.stream().anyMatch(l -> l.getSaison() == saison) ?
Uni.createFrom().nullItem() : Uni.createFrom().nullItem() :

17
src/main/webapp/src/pages/DemandeAff.jsx
View File

@ -17,14 +17,23 @@ function formatAdresse(data) {
} }
function reconstruireAdresse(infos) { function reconstruireAdresse(infos) {
console.log(infos);
let adresseReconstruite = ""; let adresseReconstruite = "";
adresseReconstruite += infos.numero_voie + ' ' + formatAdresse(infos.type_voie) + ' ';
if(infos.numero_voie === null){
if (infos.complement_adresse) {
adresseReconstruite += formatAdresse(infos.complement_adresse) + ', ';
}
}else{
adresseReconstruite += infos.numero_voie + ' ';
}
adresseReconstruite += formatAdresse(infos.type_voie) + ' ';
adresseReconstruite += formatAdresse(infos.libelle_voie) + ', '; adresseReconstruite += formatAdresse(infos.libelle_voie) + ', ';
adresseReconstruite += infos.code_postal + ' ' + infos.libelle_commune + ', '; adresseReconstruite += infos.code_postal + ' ' + infos.libelle_commune + ', ';
if (infos.complement_adresse) { if (infos.complement_adresse && infos.numero_voie !== null) {
adresseReconstruite += infos.complement_adresse.toLowerCase() + ', '; adresseReconstruite += formatAdresse(infos.complement_adresse) + ', ';
} }
if (infos.code_cedex && infos.libelle_cedex) { if (infos.code_cedex && infos.libelle_cedex) {
adresseReconstruite += 'Cedex ' + infos.code_cedex + ' - ' + infos.libelle_cedex; adresseReconstruite += 'Cedex ' + infos.code_cedex + ' - ' + infos.libelle_cedex;
@ -400,4 +409,4 @@ export function DemandeAffOk() {
espace FFSAF</p> espace FFSAF</p>
</div> </div>
); );
} }

7
src/main/webapp/src/pages/admin/affiliation/AffiliationReqPage.jsx
View File

@ -70,6 +70,7 @@ function Content({data, refresh}) {
formData.append('siret', event.target.siret.value); formData.append('siret', event.target.siret.value);
formData.append('rna', event.target.rna.value); formData.append('rna', event.target.rna.value);
formData.append('address', event.target.address.value); formData.append('address', event.target.address.value);
formData.append('contact', event.target.contact.value);
if (event.target.logo.files[0]) if (event.target.logo.files[0])
formData.append('logo', event.target.logo.files[0]); formData.append('logo', event.target.logo.files[0]);
@ -267,15 +268,9 @@ function MemberPart({index, member}) {
setCurrent(-1) setCurrent(-1)
if (mode === 2) { if (mode === 2) {
setEmail("") setEmail("")
setEmailChoice("0")
} }
}, [mode]); }, [mode]);
useEffect(() => {
if (mode !== 2 && email !== "") {
setEmailChoice("1")
}
}, [email]);
return <div className="col mb-4"> return <div className="col mb-4">
<div className="card"> <div className="card">