Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7509fe6d85 |
@@ -5,7 +5,6 @@ import {
|
|||||||
import { Users } from './users.entity';
|
import { Users } from './users.entity';
|
||||||
import { ParentsChildren } from './parents_children.entity';
|
import { ParentsChildren } from './parents_children.entity';
|
||||||
import { Dossier } from './dossiers.entity';
|
import { Dossier } from './dossiers.entity';
|
||||||
import { AmChildren } from './am_children.entity';
|
|
||||||
|
|
||||||
@Entity('parents', { schema: 'public' })
|
@Entity('parents', { schema: 'public' })
|
||||||
export class Parents {
|
export class Parents {
|
||||||
@@ -26,17 +25,6 @@ export class Parents {
|
|||||||
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
||||||
numero_dossier?: string;
|
numero_dossier?: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* Placement AM↔enfant sélectionné sur le TdB parent (couple actif) — ticket #168.
|
|
||||||
* Null / absent = le front prend le premier couple actif retourné par l’API.
|
|
||||||
*/
|
|
||||||
@Column({ name: 'id_placement_garde_courant', type: 'uuid', nullable: true })
|
|
||||||
id_placement_garde_courant?: string;
|
|
||||||
|
|
||||||
@ManyToOne(() => AmChildren, { nullable: true, onDelete: 'SET NULL' })
|
|
||||||
@JoinColumn({ name: 'id_placement_garde_courant', referencedColumnName: 'id' })
|
|
||||||
placement_garde_courant?: AmChildren;
|
|
||||||
|
|
||||||
// Lien vers enfants via la table enfants_parents
|
// Lien vers enfants via la table enfants_parents
|
||||||
@OneToMany(() => ParentsChildren, pc => pc.parent)
|
@OneToMany(() => ParentsChildren, pc => pc.parent)
|
||||||
parentChildren: ParentsChildren[];
|
parentChildren: ParentsChildren[];
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
|
||||||
|
|
||||||
/** Identité minimale enfant pour le bandeau couple — ticket #168 */
|
|
||||||
export class CoupleGardeEnfantDto {
|
|
||||||
@ApiProperty({ format: 'uuid' })
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@ApiPropertyOptional()
|
|
||||||
prenom?: string | null;
|
|
||||||
|
|
||||||
@ApiPropertyOptional()
|
|
||||||
nom?: string | null;
|
|
||||||
|
|
||||||
@ApiPropertyOptional()
|
|
||||||
photo_url?: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Identité minimale AM pour le bandeau couple — ticket #168 */
|
|
||||||
export class CoupleGardeAmDto {
|
|
||||||
@ApiProperty({ format: 'uuid', description: 'UUID utilisateur de l’AM' })
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@ApiPropertyOptional()
|
|
||||||
prenom?: string | null;
|
|
||||||
|
|
||||||
@ApiPropertyOptional()
|
|
||||||
nom?: string | null;
|
|
||||||
|
|
||||||
@ApiPropertyOptional()
|
|
||||||
photo_url?: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Un couple de garde = placement actif enfant ↔ AM */
|
|
||||||
export class CoupleGardeDto {
|
|
||||||
@ApiProperty({
|
|
||||||
format: 'uuid',
|
|
||||||
description: 'Id du placement (enfants_assistantes_maternelles.id)',
|
|
||||||
})
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@ApiProperty({ type: CoupleGardeEnfantDto })
|
|
||||||
enfant: CoupleGardeEnfantDto;
|
|
||||||
|
|
||||||
@ApiProperty({ type: CoupleGardeAmDto })
|
|
||||||
am: CoupleGardeAmDto;
|
|
||||||
|
|
||||||
@ApiProperty({ description: 'True si c’est le couple actuellement sélectionné' })
|
|
||||||
courant: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class CouplesGardeResponseDto {
|
|
||||||
@ApiProperty({ type: [CoupleGardeDto] })
|
|
||||||
couples: CoupleGardeDto[];
|
|
||||||
|
|
||||||
@ApiPropertyOptional({
|
|
||||||
format: 'uuid',
|
|
||||||
nullable: true,
|
|
||||||
description: 'Id du couple courant (null si aucun / premier couple implicite côté client)',
|
|
||||||
})
|
|
||||||
couple_courant_id: string | null;
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { ApiProperty } from '@nestjs/swagger';
|
|
||||||
import { IsNotEmpty, IsUUID } from 'class-validator';
|
|
||||||
|
|
||||||
/** Corps PUT couple de garde courant — ticket #168 */
|
|
||||||
export class DefinirCoupleGardeCourantDto {
|
|
||||||
@ApiProperty({
|
|
||||||
format: 'uuid',
|
|
||||||
description: 'Id du placement (enfants_assistantes_maternelles.id) à sélectionner',
|
|
||||||
})
|
|
||||||
@IsUUID()
|
|
||||||
@IsNotEmpty()
|
|
||||||
couple_id: string;
|
|
||||||
}
|
|
||||||
@@ -13,10 +13,7 @@ describe('ParentsController', () => {
|
|||||||
createParentDossierStaff: jest.fn(),
|
createParentDossierStaff: jest.fn(),
|
||||||
addCoParentStaff: jest.fn(),
|
addCoParentStaff: jest.fn(),
|
||||||
};
|
};
|
||||||
const parentsServiceMock = {
|
const parentsServiceMock = {};
|
||||||
listerCouplesGarde: jest.fn(),
|
|
||||||
definirCoupleGardeCourant: jest.fn(),
|
|
||||||
};
|
|
||||||
const userServiceMock = {};
|
const userServiceMock = {};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
@@ -42,31 +39,6 @@ describe('ParentsController', () => {
|
|||||||
expect(controller).toBeDefined();
|
expect(controller).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('listerCouplesGarde délègue au service (#168)', async () => {
|
|
||||||
parentsServiceMock.listerCouplesGarde.mockResolvedValue({
|
|
||||||
couples: [],
|
|
||||||
couple_courant_id: null,
|
|
||||||
});
|
|
||||||
const res = await controller.listerCouplesGarde('parent-uuid');
|
|
||||||
expect(parentsServiceMock.listerCouplesGarde).toHaveBeenCalledWith('parent-uuid');
|
|
||||||
expect(res.couples).toEqual([]);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('definirCoupleGardeCourant délègue au service (#168)', async () => {
|
|
||||||
parentsServiceMock.definirCoupleGardeCourant.mockResolvedValue({
|
|
||||||
couples: [{ id: 'pl-1', courant: true }],
|
|
||||||
couple_courant_id: 'pl-1',
|
|
||||||
});
|
|
||||||
const res = await controller.definirCoupleGardeCourant('parent-uuid', {
|
|
||||||
couple_id: 'pl-1',
|
|
||||||
});
|
|
||||||
expect(parentsServiceMock.definirCoupleGardeCourant).toHaveBeenCalledWith(
|
|
||||||
'parent-uuid',
|
|
||||||
'pl-1',
|
|
||||||
);
|
|
||||||
expect(res.couple_courant_id).toBe('pl-1');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('createDossier delegates to authService.createParentDossierStaff with CGU accepted', async () => {
|
it('createDossier delegates to authService.createParentDossierStaff with CGU accepted', async () => {
|
||||||
authServiceMock.createParentDossierStaff.mockResolvedValue({
|
authServiceMock.createParentDossierStaff.mockResolvedValue({
|
||||||
message: 'Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.',
|
message: 'Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.',
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import {
|
|||||||
Param,
|
Param,
|
||||||
Patch,
|
Patch,
|
||||||
Post,
|
Post,
|
||||||
Put,
|
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ParentsService } from './parents.service';
|
import { ParentsService } from './parents.service';
|
||||||
@@ -40,8 +39,6 @@ import { User } from 'src/common/decorators/user.decorator';
|
|||||||
import { PendingFamilyDto } from './dto/pending-family.dto';
|
import { PendingFamilyDto } from './dto/pending-family.dto';
|
||||||
import { DossierFamilleCompletDto } from './dto/dossier-famille-complet.dto';
|
import { DossierFamilleCompletDto } from './dto/dossier-famille-complet.dto';
|
||||||
import { mapParentForApi, mapParentsForApi } from './parents.mapper';
|
import { mapParentForApi, mapParentsForApi } from './parents.mapper';
|
||||||
import { CouplesGardeResponseDto } from './dto/couples-garde.dto';
|
|
||||||
import { DefinirCoupleGardeCourantDto } from './dto/definir-couple-garde-courant.dto';
|
|
||||||
|
|
||||||
@ApiTags('Parents')
|
@ApiTags('Parents')
|
||||||
@ApiBearerAuth('access-token')
|
@ApiBearerAuth('access-token')
|
||||||
@@ -54,39 +51,6 @@ export class ParentsController {
|
|||||||
private readonly authService: AuthService,
|
private readonly authService: AuthService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Get('me/couples-garde')
|
|
||||||
@Roles(RoleType.PARENT)
|
|
||||||
@ApiOperation({
|
|
||||||
summary: 'Lister les couples de garde du parent connecté — ticket #168',
|
|
||||||
description:
|
|
||||||
'Retourne les placements actifs enfant↔AM rattachés au parent, ' +
|
|
||||||
'avec indication du couple courant (bandeau TdB quotidien).',
|
|
||||||
})
|
|
||||||
@ApiResponse({ status: 200, type: CouplesGardeResponseDto })
|
|
||||||
@ApiResponse({ status: 403, description: 'Réservé au rôle parent' })
|
|
||||||
@ApiResponse({ status: 404, description: 'Parent introuvable' })
|
|
||||||
listerCouplesGarde(@User('id') userId: string): Promise<CouplesGardeResponseDto> {
|
|
||||||
return this.parentsService.listerCouplesGarde(userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Put('me/couples-garde/courant')
|
|
||||||
@Roles(RoleType.PARENT)
|
|
||||||
@ApiOperation({
|
|
||||||
summary: 'Définir le couple de garde courant — ticket #168',
|
|
||||||
description:
|
|
||||||
'Persiste la préférence de couple actif (enfant|nounou) pour contextualiser le TdB.',
|
|
||||||
})
|
|
||||||
@ApiBody({ type: DefinirCoupleGardeCourantDto })
|
|
||||||
@ApiResponse({ status: 200, type: CouplesGardeResponseDto })
|
|
||||||
@ApiResponse({ status: 400, description: 'Couple hors périmètre du parent' })
|
|
||||||
@ApiResponse({ status: 404, description: 'Parent ou couple introuvable' })
|
|
||||||
definirCoupleGardeCourant(
|
|
||||||
@User('id') userId: string,
|
|
||||||
@Body() dto: DefinirCoupleGardeCourantDto,
|
|
||||||
): Promise<CouplesGardeResponseDto> {
|
|
||||||
return this.parentsService.definirCoupleGardeCourant(userId, dto.couple_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR, RoleType.GESTIONNAIRE)
|
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR, RoleType.GESTIONNAIRE)
|
||||||
@Post('dossier')
|
@Post('dossier')
|
||||||
@HttpCode(HttpStatus.CREATED)
|
@HttpCode(HttpStatus.CREATED)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { JwtModule } from '@nestjs/jwt';
|
|||||||
import { Parents } from 'src/entities/parents.entity';
|
import { Parents } from 'src/entities/parents.entity';
|
||||||
import { DossierFamille, DossierFamilleEnfant } from 'src/entities/dossier_famille.entity';
|
import { DossierFamille, DossierFamilleEnfant } from 'src/entities/dossier_famille.entity';
|
||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
|
||||||
import { ParentsController } from './parents.controller';
|
import { ParentsController } from './parents.controller';
|
||||||
import { ParentsService } from './parents.service';
|
import { ParentsService } from './parents.service';
|
||||||
import { Users } from 'src/entities/users.entity';
|
import { Users } from 'src/entities/users.entity';
|
||||||
@@ -14,14 +13,7 @@ import { AuthModule } from '../auth/auth.module';
|
|||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TypeOrmModule.forFeature([
|
TypeOrmModule.forFeature([Parents, Users, DossierFamille, DossierFamilleEnfant, ParentsChildren]),
|
||||||
Parents,
|
|
||||||
Users,
|
|
||||||
DossierFamille,
|
|
||||||
DossierFamilleEnfant,
|
|
||||||
ParentsChildren,
|
|
||||||
AmChildren,
|
|
||||||
]),
|
|
||||||
forwardRef(() => UserModule),
|
forwardRef(() => UserModule),
|
||||||
forwardRef(() => AuthModule),
|
forwardRef(() => AuthModule),
|
||||||
JwtModule.registerAsync({
|
JwtModule.registerAsync({
|
||||||
|
|||||||
@@ -1,43 +1,12 @@
|
|||||||
import { BadRequestException, NotFoundException } from '@nestjs/common';
|
|
||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
|
||||||
import { ParentsService } from './parents.service';
|
import { ParentsService } from './parents.service';
|
||||||
import { Parents } from 'src/entities/parents.entity';
|
|
||||||
import { Users } from 'src/entities/users.entity';
|
|
||||||
import { DossierFamille } from 'src/entities/dossier_famille.entity';
|
|
||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
|
||||||
|
|
||||||
describe('ParentsService — couples de garde (#168)', () => {
|
describe('ParentsService', () => {
|
||||||
let service: ParentsService;
|
let service: ParentsService;
|
||||||
|
|
||||||
const parentsRepository = {
|
|
||||||
findOne: jest.fn(),
|
|
||||||
update: jest.fn(),
|
|
||||||
};
|
|
||||||
const parentsChildrenRepository = {
|
|
||||||
find: jest.fn(),
|
|
||||||
findOne: jest.fn(),
|
|
||||||
};
|
|
||||||
const amChildrenRepository = {
|
|
||||||
find: jest.fn(),
|
|
||||||
findOne: jest.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
jest.clearAllMocks();
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
providers: [
|
providers: [ParentsService],
|
||||||
ParentsService,
|
|
||||||
{ provide: getRepositoryToken(Parents), useValue: parentsRepository },
|
|
||||||
{ provide: getRepositoryToken(Users), useValue: {} },
|
|
||||||
{ provide: getRepositoryToken(DossierFamille), useValue: {} },
|
|
||||||
{
|
|
||||||
provide: getRepositoryToken(ParentsChildren),
|
|
||||||
useValue: parentsChildrenRepository,
|
|
||||||
},
|
|
||||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepository },
|
|
||||||
],
|
|
||||||
}).compile();
|
}).compile();
|
||||||
|
|
||||||
service = module.get<ParentsService>(ParentsService);
|
service = module.get<ParentsService>(ParentsService);
|
||||||
@@ -46,107 +15,4 @@ describe('ParentsService — couples de garde (#168)', () => {
|
|||||||
it('should be defined', () => {
|
it('should be defined', () => {
|
||||||
expect(service).toBeDefined();
|
expect(service).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('listerCouplesGarde', () => {
|
|
||||||
it('retourne une liste vide si le parent n’a pas d’enfant', async () => {
|
|
||||||
parentsRepository.findOne.mockResolvedValue({
|
|
||||||
user_id: 'p1',
|
|
||||||
id_placement_garde_courant: null,
|
|
||||||
});
|
|
||||||
parentsChildrenRepository.find.mockResolvedValue([]);
|
|
||||||
|
|
||||||
const res = await service.listerCouplesGarde('p1');
|
|
||||||
expect(res).toEqual({ couples: [], couple_courant_id: null });
|
|
||||||
expect(amChildrenRepository.find).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('mappe les placements actifs en couples et marque le courant', async () => {
|
|
||||||
parentsRepository.findOne.mockResolvedValue({
|
|
||||||
user_id: 'p1',
|
|
||||||
id_placement_garde_courant: 'pl-2',
|
|
||||||
});
|
|
||||||
parentsChildrenRepository.find.mockResolvedValue([
|
|
||||||
{ enfantId: 'e1' },
|
|
||||||
{ enfantId: 'e2' },
|
|
||||||
]);
|
|
||||||
amChildrenRepository.find.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: 'pl-1',
|
|
||||||
amId: 'am-1',
|
|
||||||
child: { id: 'e1', first_name: 'Léo', last_name: 'M', photo_url: null },
|
|
||||||
am: { user: { prenom: 'Marie', nom: 'N', photo_url: '/a.jpg' } },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'pl-2',
|
|
||||||
amId: 'am-2',
|
|
||||||
child: { id: 'e2', first_name: 'Léa', last_name: 'M', photo_url: null },
|
|
||||||
am: { user: { prenom: 'Sophie', nom: 'P', photo_url: null } },
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const res = await service.listerCouplesGarde('p1');
|
|
||||||
expect(res.couples).toHaveLength(2);
|
|
||||||
expect(res.couple_courant_id).toBe('pl-2');
|
|
||||||
expect(res.couples[1].courant).toBe(true);
|
|
||||||
expect(res.couples[0].am.prenom).toBe('Marie');
|
|
||||||
expect(res.couples[0].enfant.prenom).toBe('Léo');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('404 si parent inconnu', async () => {
|
|
||||||
parentsRepository.findOne.mockResolvedValue(null);
|
|
||||||
await expect(service.listerCouplesGarde('x')).rejects.toBeInstanceOf(
|
|
||||||
NotFoundException,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('definirCoupleGardeCourant', () => {
|
|
||||||
it('persiste le couple si l’enfant est rattaché au parent', async () => {
|
|
||||||
parentsRepository.findOne.mockResolvedValue({
|
|
||||||
user_id: 'p1',
|
|
||||||
id_placement_garde_courant: null,
|
|
||||||
});
|
|
||||||
amChildrenRepository.findOne.mockResolvedValue({
|
|
||||||
id: 'pl-1',
|
|
||||||
enfantId: 'e1',
|
|
||||||
date_fin: null,
|
|
||||||
});
|
|
||||||
parentsChildrenRepository.findOne.mockResolvedValue({
|
|
||||||
parentId: 'p1',
|
|
||||||
enfantId: 'e1',
|
|
||||||
});
|
|
||||||
parentsRepository.update.mockResolvedValue({ affected: 1 });
|
|
||||||
// second call via listerCouplesGarde
|
|
||||||
parentsChildrenRepository.find.mockResolvedValue([{ enfantId: 'e1' }]);
|
|
||||||
amChildrenRepository.find.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: 'pl-1',
|
|
||||||
amId: 'am-1',
|
|
||||||
child: { id: 'e1', first_name: 'Léo', last_name: null, photo_url: null },
|
|
||||||
am: { user: { prenom: 'Marie', nom: null, photo_url: null } },
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const res = await service.definirCoupleGardeCourant('p1', 'pl-1');
|
|
||||||
expect(parentsRepository.update).toHaveBeenCalledWith(
|
|
||||||
{ user_id: 'p1' },
|
|
||||||
{ id_placement_garde_courant: 'pl-1' },
|
|
||||||
);
|
|
||||||
expect(res.couple_courant_id).toBe('pl-1');
|
|
||||||
expect(res.couples[0].courant).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('400 si le couple n’appartient pas au parent', async () => {
|
|
||||||
parentsRepository.findOne.mockResolvedValue({ user_id: 'p1' });
|
|
||||||
amChildrenRepository.findOne.mockResolvedValue({
|
|
||||||
id: 'pl-1',
|
|
||||||
enfantId: 'e99',
|
|
||||||
});
|
|
||||||
parentsChildrenRepository.findOne.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(
|
|
||||||
service.definirCoupleGardeCourant('p1', 'pl-1'),
|
|
||||||
).rejects.toBeInstanceOf(BadRequestException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { In, IsNull, Repository } from 'typeorm';
|
import { In, Repository } from 'typeorm';
|
||||||
import { Parents } from 'src/entities/parents.entity';
|
import { Parents } from 'src/entities/parents.entity';
|
||||||
import { DossierFamille } from 'src/entities/dossier_famille.entity';
|
import { DossierFamille } from 'src/entities/dossier_famille.entity';
|
||||||
import { RoleType, Users } from 'src/entities/users.entity';
|
import { RoleType, Users } from 'src/entities/users.entity';
|
||||||
@@ -20,8 +20,6 @@ import {
|
|||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { Children } from 'src/entities/children.entity';
|
import { Children } from 'src/entities/children.entity';
|
||||||
import { UpdateParentFicheAdminDto } from './dto/update-parent-fiche-admin.dto';
|
import { UpdateParentFicheAdminDto } from './dto/update-parent-fiche-admin.dto';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
|
||||||
import { CouplesGardeResponseDto } from './dto/couples-garde.dto';
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ParentsService {
|
export class ParentsService {
|
||||||
@@ -34,8 +32,6 @@ export class ParentsService {
|
|||||||
private readonly dossierFamilleRepository: Repository<DossierFamille>,
|
private readonly dossierFamilleRepository: Repository<DossierFamille>,
|
||||||
@InjectRepository(ParentsChildren)
|
@InjectRepository(ParentsChildren)
|
||||||
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
||||||
@InjectRepository(AmChildren)
|
|
||||||
private readonly amChildrenRepository: Repository<AmChildren>,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
// Création d’un parent
|
// Création d’un parent
|
||||||
@@ -509,108 +505,4 @@ export class ParentsService {
|
|||||||
}
|
}
|
||||||
return raw.map((r: { id: string }) => r.id);
|
return raw.map((r: { id: string }) => r.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Liste les couples de garde (enfant ↔ AM) du parent connecté — ticket #168.
|
|
||||||
* Un couple = un placement actif dans enfants_assistantes_maternelles pour un enfant du parent.
|
|
||||||
*/
|
|
||||||
async listerCouplesGarde(parentUserId: string): Promise<CouplesGardeResponseDto> {
|
|
||||||
const parent = await this.parentsRepository.findOne({
|
|
||||||
where: { user_id: parentUserId },
|
|
||||||
});
|
|
||||||
if (!parent) {
|
|
||||||
throw new NotFoundException('Parent introuvable');
|
|
||||||
}
|
|
||||||
|
|
||||||
const liensEnfants = await this.parentsChildrenRepository.find({
|
|
||||||
where: { parentId: parentUserId },
|
|
||||||
select: ['enfantId'],
|
|
||||||
});
|
|
||||||
const enfantIds = liensEnfants.map((l) => l.enfantId);
|
|
||||||
if (enfantIds.length === 0) {
|
|
||||||
return { couples: [], couple_courant_id: null };
|
|
||||||
}
|
|
||||||
|
|
||||||
const placements = await this.amChildrenRepository.find({
|
|
||||||
where: { enfantId: In(enfantIds), date_fin: IsNull() },
|
|
||||||
relations: ['child', 'am', 'am.user'],
|
|
||||||
order: { date_debut: 'ASC' },
|
|
||||||
});
|
|
||||||
|
|
||||||
let idCourant = parent.id_placement_garde_courant ?? null;
|
|
||||||
const idsValides = new Set(placements.map((p) => p.id));
|
|
||||||
if (idCourant && !idsValides.has(idCourant)) {
|
|
||||||
idCourant = null;
|
|
||||||
await this.parentsRepository.update(
|
|
||||||
{ user_id: parentUserId },
|
|
||||||
{ id_placement_garde_courant: () => 'NULL' },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (!idCourant && placements.length === 1) {
|
|
||||||
idCourant = placements[0].id;
|
|
||||||
}
|
|
||||||
|
|
||||||
const couples = placements.map((p) => {
|
|
||||||
const amUser = p.am?.user;
|
|
||||||
return {
|
|
||||||
id: p.id,
|
|
||||||
enfant: {
|
|
||||||
id: p.child.id,
|
|
||||||
prenom: p.child.first_name ?? null,
|
|
||||||
nom: p.child.last_name ?? null,
|
|
||||||
photo_url: p.child.photo_url ?? null,
|
|
||||||
},
|
|
||||||
am: {
|
|
||||||
id: p.amId,
|
|
||||||
prenom: amUser?.prenom ?? null,
|
|
||||||
nom: amUser?.nom ?? null,
|
|
||||||
photo_url: amUser?.photo_url ?? null,
|
|
||||||
},
|
|
||||||
courant: idCourant != null && p.id === idCourant,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
couples,
|
|
||||||
couple_courant_id: idCourant,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Persiste le couple de garde actif pour le parent — ticket #168.
|
|
||||||
*/
|
|
||||||
async definirCoupleGardeCourant(
|
|
||||||
parentUserId: string,
|
|
||||||
coupleId: string,
|
|
||||||
): Promise<CouplesGardeResponseDto> {
|
|
||||||
const parent = await this.parentsRepository.findOne({
|
|
||||||
where: { user_id: parentUserId },
|
|
||||||
});
|
|
||||||
if (!parent) {
|
|
||||||
throw new NotFoundException('Parent introuvable');
|
|
||||||
}
|
|
||||||
|
|
||||||
const placement = await this.amChildrenRepository.findOne({
|
|
||||||
where: { id: coupleId, date_fin: IsNull() },
|
|
||||||
});
|
|
||||||
if (!placement) {
|
|
||||||
throw new NotFoundException('Couple de garde introuvable ou inactif');
|
|
||||||
}
|
|
||||||
|
|
||||||
const lien = await this.parentsChildrenRepository.findOne({
|
|
||||||
where: { parentId: parentUserId, enfantId: placement.enfantId },
|
|
||||||
});
|
|
||||||
if (!lien) {
|
|
||||||
throw new BadRequestException(
|
|
||||||
'Ce couple ne concerne pas un enfant rattaché à ce parent',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.parentsRepository.update(
|
|
||||||
{ user_id: parentUserId },
|
|
||||||
{ id_placement_garde_courant: coupleId },
|
|
||||||
);
|
|
||||||
|
|
||||||
return this.listerCouplesGarde(parentUserId);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-14
@@ -154,10 +154,7 @@ CREATE INDEX idx_assistantes_maternelles_numero_dossier
|
|||||||
CREATE TABLE parents (
|
CREATE TABLE parents (
|
||||||
id_utilisateur UUID PRIMARY KEY REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
id_utilisateur UUID PRIMARY KEY REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
||||||
id_co_parent UUID REFERENCES utilisateurs(id),
|
id_co_parent UUID REFERENCES utilisateurs(id),
|
||||||
numero_dossier VARCHAR(20),
|
numero_dossier VARCHAR(20)
|
||||||
-- Préférence couple de garde actif (TdB quotidien) — ticket #168
|
|
||||||
-- FK ajoutée après création de enfants_assistantes_maternelles (voir ALTER plus bas)
|
|
||||||
id_placement_garde_courant UUID
|
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE INDEX idx_parents_numero_dossier
|
CREATE INDEX idx_parents_numero_dossier
|
||||||
@@ -209,16 +206,6 @@ CREATE UNIQUE INDEX uq_enfant_garde_active
|
|||||||
ON enfants_assistantes_maternelles (id_enfant)
|
ON enfants_assistantes_maternelles (id_enfant)
|
||||||
WHERE date_fin IS NULL;
|
WHERE date_fin IS NULL;
|
||||||
|
|
||||||
-- FK couple courant parent → placement (#168) — après table enfants_assistantes_maternelles
|
|
||||||
ALTER TABLE parents
|
|
||||||
ADD CONSTRAINT fk_parents_placement_garde_courant
|
|
||||||
FOREIGN KEY (id_placement_garde_courant)
|
|
||||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
|
|
||||||
|
|
||||||
CREATE INDEX idx_parents_placement_garde_courant
|
|
||||||
ON parents(id_placement_garde_courant)
|
|
||||||
WHERE id_placement_garde_courant IS NOT NULL;
|
|
||||||
|
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
-- Table : dossier_famille (inscription parent — ticket #119)
|
-- Table : dossier_famille (inscription parent — ticket #119)
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
-- Ticket #168 — Couple de garde courant (préférence parent)
|
|
||||||
-- Idempotent : safe à rejouer.
|
|
||||||
|
|
||||||
ALTER TABLE parents
|
|
||||||
ADD COLUMN IF NOT EXISTS id_placement_garde_courant UUID
|
|
||||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_parents_placement_garde_courant
|
|
||||||
ON parents(id_placement_garde_courant)
|
|
||||||
WHERE id_placement_garde_courant IS NOT NULL;
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
# 📋 Décisions Projet - P'titsPas
|
# 📋 Décisions Projet - P'titsPas
|
||||||
|
|
||||||
**Version** : 1.3
|
**Version** : 1.2
|
||||||
**Date** : 24 Septembre 2026
|
**Date** : 16 Juin 2026
|
||||||
**Auteur** : Équipe PtitsPas
|
**Auteur** : Équipe PtitsPas
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -465,34 +465,19 @@ docs/
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### 26. Branches Git + merge squash (norme)
|
### 26. Branches Git
|
||||||
|
|
||||||
**Décision** : ✅ **`develop` + `master` + `feature/*`, merges en squash**
|
**Décision** : ✅ **Stratégie simple : master + feature branches**
|
||||||
|
|
||||||
**Justification** :
|
**Justification** :
|
||||||
- Simplicité (petite équipe)
|
- Simplicité (petite équipe)
|
||||||
- Historique lisible sur `develop` / `master` (1 commit = 1 ticket)
|
- Flexibilité
|
||||||
- Déploiement prod uniquement depuis `master`
|
|
||||||
|
|
||||||
**Branches** :
|
**Branches** :
|
||||||
- `master` : Production (déploiement auto)
|
- `master` : Production
|
||||||
- `develop` : Intégration / recette
|
- `archive/*` : Archives (ex: maquette initiale)
|
||||||
- `feature/*` : Ticket en cours (depuis `develop`)
|
- `migration/*` : Migrations (ex: intégration YNOV)
|
||||||
- `archive/*`, `migration/*` : Archives / migrations ponctuelles
|
- `feature/*` : Nouvelles fonctionnalités
|
||||||
|
|
||||||
**Flux (norme à partir de #169+)** :
|
|
||||||
1. Branche `feature/N-…` depuis `develop`
|
|
||||||
2. PR **feature → `develop`** : merge **squash** (`Do: squash` côté Gitea)
|
|
||||||
3. Quand un lot est prêt : PR **`develop` → `master`** : merge **squash** également
|
|
||||||
4. Message squash : `feat(#N): …` / `fix(#N): …` + `Closes #N` si applicable
|
|
||||||
|
|
||||||
**Exception** : les merges `--no-ff` déjà poussés (ex. #167, #168) restent tels quels — pas de réécriture d’historique.
|
|
||||||
|
|
||||||
**API Gitea** (rappel) :
|
|
||||||
```http
|
|
||||||
POST /repos/jmartin/petitspas/pulls/{index}/merge
|
|
||||||
{"Do":"squash","MergeTitleField":"feat(#N): …","MergeMessageField":"Closes #N"}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -116,17 +116,10 @@ curl -s -H "Authorization: token $GITEA_TOKEN" \
|
|||||||
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls?state=open" | jq .
|
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls?state=open" | jq .
|
||||||
|
|
||||||
# Créer une PR (head = branche source, base = branche cible)
|
# Créer une PR (head = branche source, base = branche cible)
|
||||||
# Norme : feature/* → develop, puis develop → master
|
|
||||||
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
|
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d '{"head":"feature/XX-nom","base":"develop","title":"feat(#XX): Titre","body":"Closes #XX"}' \
|
-d '{"head":"develop","base":"master","title":"Titre de la PR"}' \
|
||||||
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
|
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
|
||||||
|
|
||||||
# Merger en squash (norme — voir 24_DECISIONS-PROJET.md §26)
|
|
||||||
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"Do":"squash","MergeTitleField":"feat(#XX): Titre","MergeMessageField":"Closes #XX"}' \
|
|
||||||
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls/{index}/merge"
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### 3.4 Branches
|
### 3.4 Branches
|
||||||
|
|||||||
@@ -194,9 +194,6 @@ frontend/lib/
|
|||||||
|
|
||||||
## Workflow Git
|
## Workflow Git
|
||||||
|
|
||||||
Norme projet : **squash merge** (voir [24_DECISIONS-PROJET.md](./24_DECISIONS-PROJET.md) §26).
|
|
||||||
Cible habituelle : `feature/*` → `develop` ; puis `develop` → `master` quand le lot est prêt.
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 1. Créer une branche feature
|
# 1. Créer une branche feature
|
||||||
git checkout develop
|
git checkout develop
|
||||||
@@ -207,22 +204,15 @@ git checkout -b feature/XX-nom-ticket
|
|||||||
git add .
|
git add .
|
||||||
git commit -m "feat(#XX): Description courte"
|
git commit -m "feat(#XX): Description courte"
|
||||||
|
|
||||||
# 3. Pousser et créer PR vers develop
|
# 3. Pousser et créer PR
|
||||||
git push -u origin feature/XX-nom-ticket
|
git push -u origin feature/XX-nom-ticket
|
||||||
|
|
||||||
# 4. Créer PR (base = develop)
|
# 4. Créer PR vers master via Gitea ou API
|
||||||
curl -X POST \
|
curl -X POST \
|
||||||
-H "Authorization: token $GITEA_TOKEN" \
|
-H "Authorization: token giteabu_1796c6aace0e2ef7e4fdb49cdc3bc1bf8ee31fbc" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d '{"title":"feat(#XX): Titre","body":"Description\n\nCloses #XX","head":"feature/XX-nom-ticket","base":"develop"}' \
|
-d '{"title":"feat(#XX): Titre","body":"Description\n\nCloses #XX","head":"feature/XX-nom-ticket","base":"master"}' \
|
||||||
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
|
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
|
||||||
|
|
||||||
# 5. Merger en squash (pas merge commit)
|
|
||||||
curl -X POST \
|
|
||||||
-H "Authorization: token $GITEA_TOKEN" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"Do":"squash","MergeTitleField":"feat(#XX): Titre","MergeMessageField":"Closes #XX"}' \
|
|
||||||
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls/{index}/merge"
|
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -64,52 +64,43 @@ class CoupleSelectorBandeau extends StatelessWidget {
|
|||||||
mode: mode,
|
mode: mode,
|
||||||
couple: selected,
|
couple: selected,
|
||||||
showChevron: multi,
|
showChevron: multi,
|
||||||
colorIndex: couples.indexOf(selected),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!multi) return card;
|
if (!multi) return card;
|
||||||
|
|
||||||
return Theme(
|
return PopupMenuButton<String>(
|
||||||
data: Theme.of(context).copyWith(
|
tooltip: 'Changer de garde',
|
||||||
hoverColor: Colors.transparent,
|
offset: const Offset(0, 4), // Rapproché du bandeau principal
|
||||||
splashColor: Colors.transparent,
|
color: Colors.transparent, // Le fond devient invisible
|
||||||
highlightColor: Colors.transparent,
|
elevation: 0, // Pas d'ombre carrée
|
||||||
focusColor: Colors.transparent,
|
constraints: BoxConstraints.tightFor(width: constraints.maxWidth),
|
||||||
),
|
padding: EdgeInsets.zero,
|
||||||
child: PopupMenuButton<String>(
|
onSelected: (id) {
|
||||||
tooltip: 'Changer de garde',
|
final chosen = couples.firstWhere((c) => c.id == id);
|
||||||
// L'offset doit être suffisant pour descendre sous la carte (qui fait 90px).
|
onCoupleSelected?.call(chosen);
|
||||||
offset: const Offset(0, 95),
|
},
|
||||||
color: Colors.transparent, // Le fond devient invisible
|
itemBuilder: (context) => [
|
||||||
elevation: 0, // Pas d'ombre carrée
|
for (final c in couples)
|
||||||
constraints: BoxConstraints.tightFor(width: constraints.maxWidth),
|
// On ne réaffiche pas le couple actuellement sélectionné dans le menu déroulant
|
||||||
padding: EdgeInsets.zero,
|
// puisqu'il est déjà visible en tant que "bouton" principal.
|
||||||
onSelected: (id) {
|
if (c.id != selected.id)
|
||||||
final chosen = couples.firstWhere((c) => c.id == id);
|
PopupMenuItem<String>(
|
||||||
onCoupleSelected?.call(chosen);
|
value: c.id,
|
||||||
},
|
padding: EdgeInsets.zero,
|
||||||
itemBuilder: (context) => [
|
// Marge verticale pour que les pastilles ne soient pas collées
|
||||||
for (final c in couples)
|
child: Padding(
|
||||||
if (c.id != selected.id)
|
padding: const EdgeInsets.only(bottom: 8),
|
||||||
PopupMenuItem<String>(
|
child: _CoupleCard(
|
||||||
value: c.id,
|
mode: mode,
|
||||||
padding: EdgeInsets.zero,
|
couple: c,
|
||||||
height: 100, // Hauteur de la carte (90) + un peu de marge (10)
|
showChevron: false,
|
||||||
child: Padding(
|
selected: false,
|
||||||
padding: const EdgeInsets.only(bottom: 10),
|
isMenuItem: true,
|
||||||
child: _CoupleCard(
|
|
||||||
mode: mode,
|
|
||||||
couple: c,
|
|
||||||
showChevron: false,
|
|
||||||
selected: false,
|
|
||||||
isMenuItem: true,
|
|
||||||
colorIndex: couples.indexOf(c),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
child: card,
|
],
|
||||||
),
|
child: card,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -122,7 +113,6 @@ class _CoupleCard extends StatelessWidget {
|
|||||||
final bool showChevron;
|
final bool showChevron;
|
||||||
final bool selected;
|
final bool selected;
|
||||||
final bool isMenuItem;
|
final bool isMenuItem;
|
||||||
final int colorIndex;
|
|
||||||
|
|
||||||
const _CoupleCard({
|
const _CoupleCard({
|
||||||
required this.mode,
|
required this.mode,
|
||||||
@@ -130,71 +120,65 @@ class _CoupleCard extends StatelessWidget {
|
|||||||
required this.showChevron,
|
required this.showChevron,
|
||||||
this.selected = true,
|
this.selected = true,
|
||||||
this.isMenuItem = false,
|
this.isMenuItem = false,
|
||||||
required this.colorIndex,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
// Dans le menu, les non-sélectionnés sont un peu translucides
|
||||||
|
final opacity = (!selected && isMenuItem) ? 0.65 : 1.0;
|
||||||
|
|
||||||
return Container(
|
return Container(
|
||||||
height: 90,
|
height: 90,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
image: DecorationImage(
|
image: DecorationImage(
|
||||||
image: AssetImage(QuotidienTheme.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length]),
|
image: AssetImage(QuotidienTheme.bandeauAssetForCouple(couple.id)),
|
||||||
fit: BoxFit.fill,
|
fit: BoxFit.fill,
|
||||||
|
opacity: opacity,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Padding(
|
child: Opacity(
|
||||||
padding: const EdgeInsets.only(right: 12),
|
opacity: opacity,
|
||||||
child: _MembreTile(
|
child: _MembreTile(
|
||||||
photoUrl: couple.enfant.photoUrl,
|
photoUrl: couple.enfant.photoUrl,
|
||||||
name: (couple.enfant.prenom != null && couple.enfant.prenom!.isNotEmpty)
|
name: couple.enfant.displayName(fallback: 'Enfant'),
|
||||||
? couple.enfant.prenom!
|
|
||||||
: couple.enfant.displayName(fallback: 'Enfant'),
|
|
||||||
fallbackIcon: Icons.child_care,
|
fallbackIcon: Icons.child_care,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Container(
|
Container(
|
||||||
width: 8,
|
width: 1,
|
||||||
height: 44,
|
height: 44,
|
||||||
decoration: const BoxDecoration(
|
margin: const EdgeInsets.symmetric(horizontal: 12),
|
||||||
image: DecorationImage(
|
color: QuotidienTheme.ink.withValues(alpha: 0.15 * opacity),
|
||||||
image: AssetImage(QuotidienTheme.pencilLineVerticalAsset),
|
|
||||||
fit: BoxFit.contain,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Padding(
|
child: Opacity(
|
||||||
padding: const EdgeInsets.only(left: 12),
|
opacity: opacity,
|
||||||
child: _MembreTile(
|
child: _MembreTile(
|
||||||
photoUrl: couple.am.photoUrl,
|
photoUrl: couple.am.photoUrl,
|
||||||
name: (couple.am.prenom != null && couple.am.prenom!.isNotEmpty)
|
name: couple.am.displayName(
|
||||||
? couple.am.prenom!
|
fallback: mode == CoupleBandeauMode.parent
|
||||||
: couple.am.displayName(
|
? 'Nounou'
|
||||||
fallback: mode == CoupleBandeauMode.parent
|
: 'Parent',
|
||||||
? 'Nounou'
|
),
|
||||||
: 'Parent',
|
|
||||||
),
|
|
||||||
fallbackIcon: mode == CoupleBandeauMode.parent
|
fallbackIcon: mode == CoupleBandeauMode.parent
|
||||||
? Icons.volunteer_activism
|
? Icons.volunteer_activism
|
||||||
: Icons.person_outline,
|
: Icons.person_outline,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(
|
if (showChevron)
|
||||||
width: 28,
|
Padding(
|
||||||
child: showChevron
|
padding: const EdgeInsets.only(left: 4),
|
||||||
? const Icon(
|
child: Icon(
|
||||||
Icons.keyboard_arrow_down,
|
Icons.keyboard_arrow_down,
|
||||||
color: QuotidienTheme.ink,
|
color: QuotidienTheme.ink.withValues(alpha: opacity),
|
||||||
)
|
),
|
||||||
: null,
|
),
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -217,15 +201,15 @@ class _MembreTile extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
_Avatar(photoUrl: photoUrl, fallbackIcon: fallbackIcon, size: 64),
|
_Avatar(photoUrl: photoUrl, fallbackIcon: fallbackIcon, size: 48),
|
||||||
const SizedBox(width: 12),
|
const SizedBox(width: 10),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
name,
|
name,
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: GoogleFonts.merienda(
|
style: GoogleFonts.merienda(
|
||||||
fontSize: 22,
|
fontSize: 15,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
color: QuotidienTheme.ink,
|
color: QuotidienTheme.ink,
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user