Compare commits
3 Commits
59919834b9
...
16001f695b
| Author | SHA1 | Date | |
|---|---|---|---|
| 16001f695b | |||
| e65ae4cebe | |||
| 1ebf683825 |
@ -552,8 +552,7 @@ export class AuthService {
|
|||||||
: undefined;
|
: undefined;
|
||||||
enfant.photo_url = urlPhoto || undefined;
|
enfant.photo_url = urlPhoto || undefined;
|
||||||
enfant.status = enfantDto.date_naissance ? StatutEnfantType.SANS_GARDE : StatutEnfantType.A_NAITRE;
|
enfant.status = enfantDto.date_naissance ? StatutEnfantType.SANS_GARDE : StatutEnfantType.A_NAITRE;
|
||||||
enfant.consent_photo = !!enfantDto.consent_photo;
|
enfant.consent_photo = false;
|
||||||
enfant.consent_photo_at = enfant.consent_photo ? new Date() : null!;
|
|
||||||
enfant.is_multiple = enfantDto.grossesse_multiple || false;
|
enfant.is_multiple = enfantDto.grossesse_multiple || false;
|
||||||
|
|
||||||
const enfantEnregistre = await manager.save(Children, enfant);
|
const enfantEnregistre = await manager.save(Children, enfant);
|
||||||
@ -1075,12 +1074,6 @@ export class AuthService {
|
|||||||
if (enfantDto.grossesse_multiple !== undefined) {
|
if (enfantDto.grossesse_multiple !== undefined) {
|
||||||
enfant.is_multiple = enfantDto.grossesse_multiple;
|
enfant.is_multiple = enfantDto.grossesse_multiple;
|
||||||
}
|
}
|
||||||
if (enfantDto.consent_photo !== undefined) {
|
|
||||||
enfant.consent_photo = !!enfantDto.consent_photo;
|
|
||||||
enfant.consent_photo_at = enfant.consent_photo
|
|
||||||
? new Date()
|
|
||||||
: null!;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (enfantDto.photo_base64 && enfantDto.photo_filename) {
|
if (enfantDto.photo_base64 && enfantDto.photo_filename) {
|
||||||
enfant.photo_url = await this.sauvegarderPhotoDepuisBase64(
|
enfant.photo_url = await this.sauvegarderPhotoDepuisBase64(
|
||||||
|
|||||||
@ -59,14 +59,5 @@ export class EnfantInscriptionDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
grossesse_multiple?: boolean;
|
grossesse_multiple?: boolean;
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
example: true,
|
|
||||||
required: false,
|
|
||||||
description: 'Consentement affichage / stockage photo (colonne enfants.consentement_photo)',
|
|
||||||
})
|
|
||||||
@IsOptional()
|
|
||||||
@IsBoolean()
|
|
||||||
consent_photo?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -120,13 +120,7 @@ export class EnfantsService {
|
|||||||
const child = await this.childrenRepository.findOne({ where: { id } });
|
const child = await this.childrenRepository.findOne({ where: { id } });
|
||||||
if (!child) throw new NotFoundException('Enfant introuvable');
|
if (!child) throw new NotFoundException('Enfant introuvable');
|
||||||
|
|
||||||
const patch: Partial<Children> = { ...dto } as Partial<Children>;
|
await this.childrenRepository.update(id, dto);
|
||||||
if (dto.consent_photo !== undefined) {
|
|
||||||
patch.consent_photo = dto.consent_photo;
|
|
||||||
patch.consent_photo_at = dto.consent_photo ? new Date() : null!;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.childrenRepository.update(id, patch);
|
|
||||||
return this.findOne(id, currentUser);
|
return this.findOne(id, currentUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -167,7 +167,6 @@ class ParentRegistrationPayload {
|
|||||||
final map = <String, dynamic>{
|
final map = <String, dynamic>{
|
||||||
'genre': apiGenres.contains(c.genre) ? c.genre : 'Autre',
|
'genre': apiGenres.contains(c.genre) ? c.genre : 'Autre',
|
||||||
'grossesse_multiple': c.multipleBirth,
|
'grossesse_multiple': c.multipleBirth,
|
||||||
'consent_photo': c.photoConsent,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
final prenom = c.firstName.trim();
|
final prenom = c.firstName.trim();
|
||||||
|
|||||||
@ -44,8 +44,8 @@ class RepriseMapper {
|
|||||||
lastName: e.lastName ?? '',
|
lastName: e.lastName ?? '',
|
||||||
dob: dob,
|
dob: dob,
|
||||||
genre: e.gender ?? '',
|
genre: e.gender ?? '',
|
||||||
// Legacy : dossiers inscrits avant #144 avaient consent_photo=false malgré une photo.
|
// Inscription initiale exigeait la coche pour envoyer la photo ; le back
|
||||||
// On pré-coche encore si photo en base pour ne pas bloquer la reprise.
|
// ne persistait pas toujours consent_photo — on pré-coche si photo en base.
|
||||||
photoConsent: e.consentPhoto || hasPhoto,
|
photoConsent: e.consentPhoto || hasPhoto,
|
||||||
multipleBirth: e.estMultiple,
|
multipleBirth: e.estMultiple,
|
||||||
isUnbornChild: isUnborn,
|
isUnbornChild: isUnborn,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user