Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cef24a6748 | ||
|
|
41f7006073 | ||
|
|
8d8627cf38 | ||
|
|
6a586110e7 | ||
|
|
f9fd8d73a8 | ||
|
|
93ee3a5549 | ||
|
|
db08aca714 | ||
|
|
494f0e4c19 | ||
|
|
9a4664a8ea | ||
|
|
bf00933f65 | ||
|
|
7b4650b81b | ||
|
|
b7ae07f5aa | ||
|
|
a88f791317 | ||
|
|
138398a4a0 | ||
|
|
7cf30643aa | ||
|
|
5eb3468fe0 | ||
|
|
df4f48e864 | ||
|
|
6f9136aae5 |
@@ -16,6 +16,7 @@ import { AllExceptionsFilter } from './common/filters/all_exceptions.filters';
|
||||
import { EnfantsModule } from './routes/enfants/enfants.module';
|
||||
import { AppConfigModule } from './modules/config/config.module';
|
||||
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
||||
import { AbsencesGardeModule } from './modules/absences-garde';
|
||||
import { RelaisModule } from './routes/relais/relais.module';
|
||||
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
||||
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||
@@ -56,6 +57,7 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||
AuthModule,
|
||||
AppConfigModule,
|
||||
DocumentsLegauxModule,
|
||||
AbsencesGardeModule,
|
||||
RelaisModule,
|
||||
DossiersModule,
|
||||
SuppressionsModule,
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
import {
|
||||
Column,
|
||||
CreateDateColumn,
|
||||
Entity,
|
||||
JoinColumn,
|
||||
ManyToOne,
|
||||
PrimaryGeneratedColumn,
|
||||
UpdateDateColumn,
|
||||
} from 'typeorm';
|
||||
import { AmChildren } from './am_children.entity';
|
||||
import { Users } from './users.entity';
|
||||
|
||||
export enum TypeAbsenceGardeType {
|
||||
ABSENCE_ENFANT = 'absence_enfant',
|
||||
CONGE_AM = 'conge_am',
|
||||
ARRET_MALADIE_AM = 'arret_maladie_am',
|
||||
}
|
||||
|
||||
export enum StatutAbsenceGardeType {
|
||||
EN_ATTENTE = 'en_attente',
|
||||
ACCEPTE = 'accepte',
|
||||
REFUSE = 'refuse',
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérité métier des absences / congés / arrêts par couple AM↔enfant.
|
||||
* Les cartes (module ultérieur) collectent ; cette table stocke.
|
||||
* Ticket #193.
|
||||
*/
|
||||
@Entity('absences_garde', { schema: 'public' })
|
||||
export class AbsencesGarde {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ name: 'id_placement', type: 'uuid' })
|
||||
id_placement: string;
|
||||
|
||||
@ManyToOne(() => AmChildren, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'id_placement', referencedColumnName: 'id' })
|
||||
placement: AmChildren;
|
||||
|
||||
@Column({
|
||||
type: 'enum',
|
||||
enum: TypeAbsenceGardeType,
|
||||
enumName: 'type_absence_garde_type',
|
||||
name: 'type',
|
||||
})
|
||||
type: TypeAbsenceGardeType;
|
||||
|
||||
@Column({ name: 'date_debut', type: 'date' })
|
||||
date_debut: string;
|
||||
|
||||
@Column({ name: 'date_fin', type: 'date' })
|
||||
date_fin: string;
|
||||
|
||||
@Column({
|
||||
type: 'enum',
|
||||
enum: StatutAbsenceGardeType,
|
||||
enumName: 'statut_absence_garde_type',
|
||||
name: 'statut',
|
||||
default: StatutAbsenceGardeType.EN_ATTENTE,
|
||||
})
|
||||
statut: StatutAbsenceGardeType;
|
||||
|
||||
/** Purge auto pour en_attente/refuse ; accepte → infinity. */
|
||||
@Column({ name: 'expire_at', type: 'timestamptz' })
|
||||
expire_at: Date;
|
||||
|
||||
@Column({ name: 'cree_par', type: 'uuid', nullable: true })
|
||||
cree_par?: string;
|
||||
|
||||
@ManyToOne(() => Users, { nullable: true, onDelete: 'SET NULL' })
|
||||
@JoinColumn({ name: 'cree_par', referencedColumnName: 'id' })
|
||||
createdBy?: Users;
|
||||
|
||||
/** Réf. carte de collecte (FK quand module Cartes existera). */
|
||||
@Column({ name: 'id_card_instance', type: 'uuid', nullable: true })
|
||||
id_card_instance?: string;
|
||||
|
||||
@Column({ name: 'motif', type: 'text', nullable: true })
|
||||
motif?: string;
|
||||
|
||||
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||
cree_le: Date;
|
||||
|
||||
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||
modifie_le: Date;
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
|
||||
import { Children } from "./children.entity";
|
||||
import { Users } from "./users.entity";
|
||||
import { Parents } from "./parents.entity";
|
||||
|
||||
export enum TypeEvenementType {
|
||||
ABSENCE_ENFANT = 'absence_enfant',
|
||||
CONGE_AM = 'conge_am',
|
||||
CONGE_PARENT = 'conge_parent',
|
||||
ARRET_MALADIE_AM = 'arret_maladie_am',
|
||||
EVENEMENT_RPE = 'evenement_rpe',
|
||||
}
|
||||
|
||||
export enum StatutEvenementType {
|
||||
PROPOSE = 'propose',
|
||||
VALIDE = 'valide',
|
||||
REFUSE = 'refuse',
|
||||
}
|
||||
|
||||
@Entity('evenements')
|
||||
export class Evenement {
|
||||
// Define your columns and relationships here
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({
|
||||
type: 'enum',
|
||||
enum: TypeEvenementType,
|
||||
enumName: 'type_evenement_type',
|
||||
name: 'type'
|
||||
})
|
||||
type: TypeEvenementType;
|
||||
|
||||
@ManyToOne(() => Children, { onDelete: 'CASCADE', nullable: true })
|
||||
@JoinColumn({ name: 'id_enfant', referencedColumnName: 'id' })
|
||||
child?: Children;
|
||||
|
||||
@ManyToOne(() => Users, { nullable: true })
|
||||
@JoinColumn({ name: 'id_am', referencedColumnName: 'id' })
|
||||
assistanteMaternelle?: Users;
|
||||
|
||||
@ManyToOne(() => Parents, { nullable: true })
|
||||
@JoinColumn({ name: 'id_parent', referencedColumnName: 'user_id' })
|
||||
parent?: Parents;
|
||||
|
||||
@ManyToOne(() => Users, { nullable: true })
|
||||
@JoinColumn({ name: 'cree_par', referencedColumnName: 'id' })
|
||||
created_by?: Users;
|
||||
|
||||
@Column({ type: 'timestamptz', nullable: true, name: 'date_debut' })
|
||||
start_date?: Date;
|
||||
|
||||
@Column({ type: 'timestamptz', nullable: true, name: 'date_fin' })
|
||||
end_date?: Date;
|
||||
|
||||
@Column({ type: 'text', nullable: true, name: 'commentaires' })
|
||||
comments?: string;
|
||||
|
||||
@Column({
|
||||
type: 'enum',
|
||||
enum: StatutEvenementType,
|
||||
enumName: 'statut_evenement_type',
|
||||
name: 'statut',
|
||||
default: StatutEvenementType.PROPOSE
|
||||
})
|
||||
status: StatutEvenementType;
|
||||
|
||||
@Column({type: 'timestamptz', nullable: true, name: 'delai_grace'})
|
||||
grace_deadline?: Date;
|
||||
|
||||
@Column({type: 'boolean', default: false, name: 'urgent'})
|
||||
urgent: boolean;
|
||||
|
||||
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||
created_at: Date;
|
||||
|
||||
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||
updated_at: Date;
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
import { Users } from './users.entity';
|
||||
import { ParentsChildren } from './parents_children.entity';
|
||||
import { Dossier } from './dossiers.entity';
|
||||
import { AmChildren } from './am_children.entity';
|
||||
|
||||
@Entity('parents', { schema: 'public' })
|
||||
export class Parents {
|
||||
@@ -25,6 +26,17 @@ export class Parents {
|
||||
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
||||
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
|
||||
@OneToMany(() => ParentsChildren, pc => pc.parent)
|
||||
parentChildren: ParentsChildren[];
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { AbsencesGardeController } from './absences-garde.controller';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
import { TypeAbsenceGardeType } from 'src/entities/absences_garde.entity';
|
||||
|
||||
describe('AbsencesGardeController (#172)', () => {
|
||||
let controller: AbsencesGardeController;
|
||||
const serviceMock = {
|
||||
lister: jest.fn(),
|
||||
creer: jest.fn(),
|
||||
maj: jest.fn(),
|
||||
supprimer: jest.fn(),
|
||||
};
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
controllers: [AbsencesGardeController],
|
||||
providers: [{ provide: AbsencesGardeService, useValue: serviceMock }],
|
||||
})
|
||||
.overrideGuard(AuthGuard)
|
||||
.useValue({ canActivate: () => true })
|
||||
.overrideGuard(RolesGuard)
|
||||
.useValue({ canActivate: () => true })
|
||||
.compile();
|
||||
|
||||
controller = module.get(AbsencesGardeController);
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
expect(controller).toBeDefined();
|
||||
});
|
||||
|
||||
it('lister délègue au service', async () => {
|
||||
serviceMock.lister.mockResolvedValue({ items: [] });
|
||||
const res = await controller.lister(
|
||||
'u1',
|
||||
RoleType.PARENT,
|
||||
'pl-1',
|
||||
undefined,
|
||||
undefined,
|
||||
'2026-01-01',
|
||||
'2026-12-31',
|
||||
);
|
||||
expect(serviceMock.lister).toHaveBeenCalledWith('u1', RoleType.PARENT, {
|
||||
placementId: 'pl-1',
|
||||
type: undefined,
|
||||
statut: undefined,
|
||||
from: '2026-01-01',
|
||||
to: '2026-12-31',
|
||||
});
|
||||
expect(res.items).toEqual([]);
|
||||
});
|
||||
|
||||
it('creer délègue au service', async () => {
|
||||
serviceMock.creer.mockResolvedValue({ id: 'a1' });
|
||||
const dto = {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-02',
|
||||
};
|
||||
await controller.creer('u1', RoleType.PARENT, dto);
|
||||
expect(serviceMock.creer).toHaveBeenCalledWith(
|
||||
'u1',
|
||||
RoleType.PARENT,
|
||||
dto,
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,124 @@
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
Delete,
|
||||
Get,
|
||||
HttpCode,
|
||||
HttpStatus,
|
||||
Param,
|
||||
ParseUUIDPipe,
|
||||
Patch,
|
||||
Post,
|
||||
Query,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import {
|
||||
ApiBearerAuth,
|
||||
ApiBody,
|
||||
ApiOperation,
|
||||
ApiQuery,
|
||||
ApiResponse,
|
||||
ApiTags,
|
||||
} from '@nestjs/swagger';
|
||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||
import { User } from 'src/common/decorators/user.decorator';
|
||||
import {
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
import {
|
||||
AbsenceGardeDto,
|
||||
CreerAbsenceGardeDto,
|
||||
ListeAbsencesGardeDto,
|
||||
MajAbsenceGardeDto,
|
||||
} from './dto/absences-garde.dto';
|
||||
|
||||
@ApiTags('Absences garde')
|
||||
@ApiBearerAuth('access-token')
|
||||
@Controller('absences-garde')
|
||||
@UseGuards(AuthGuard, RolesGuard)
|
||||
export class AbsencesGardeController {
|
||||
constructor(private readonly absencesGardeService: AbsencesGardeService) {}
|
||||
|
||||
@Get()
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({
|
||||
summary: 'Lister les absences / congés / arrêts — ticket #172',
|
||||
description:
|
||||
'Sans placementId : tous les placements du user (parent = famille multi-AM ; AM = tous accueils). ' +
|
||||
'Avec placementId : un couple enfant–AM.',
|
||||
})
|
||||
@ApiQuery({ name: 'placementId', required: false })
|
||||
@ApiQuery({ name: 'type', required: false, enum: TypeAbsenceGardeType })
|
||||
@ApiQuery({ name: 'statut', required: false, enum: StatutAbsenceGardeType })
|
||||
@ApiQuery({ name: 'from', required: false, description: 'YYYY-MM-DD' })
|
||||
@ApiQuery({ name: 'to', required: false, description: 'YYYY-MM-DD' })
|
||||
@ApiResponse({ status: 200, type: ListeAbsencesGardeDto })
|
||||
lister(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Query('placementId') placementId?: string,
|
||||
@Query('type') type?: TypeAbsenceGardeType,
|
||||
@Query('statut') statut?: StatutAbsenceGardeType,
|
||||
@Query('from') from?: string,
|
||||
@Query('to') to?: string,
|
||||
): Promise<ListeAbsencesGardeDto> {
|
||||
return this.absencesGardeService.lister(userId, role, {
|
||||
placementId,
|
||||
type,
|
||||
statut,
|
||||
from,
|
||||
to,
|
||||
});
|
||||
}
|
||||
|
||||
@Post()
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({ summary: 'Créer une période d’absence / congé / arrêt — #172' })
|
||||
@ApiBody({ type: CreerAbsenceGardeDto })
|
||||
@ApiResponse({ status: 201, type: AbsenceGardeDto })
|
||||
@HttpCode(HttpStatus.CREATED)
|
||||
creer(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Body() dto: CreerAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
return this.absencesGardeService.creer(userId, role, dto);
|
||||
}
|
||||
|
||||
@Patch(':id')
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({
|
||||
summary: 'Mettre à jour dates / statut / motif — #172',
|
||||
description:
|
||||
'Parent : accept/refuse congé (motivation si refus), ack arrêt. ' +
|
||||
'AM : modifier dates (en attente / refuse / accepté), republication après refus.',
|
||||
})
|
||||
@ApiBody({ type: MajAbsenceGardeDto })
|
||||
@ApiResponse({ status: 200, type: AbsenceGardeDto })
|
||||
maj(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Param('id', ParseUUIDPipe) id: string,
|
||||
@Body() dto: MajAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
return this.absencesGardeService.maj(userId, role, id, dto);
|
||||
}
|
||||
|
||||
@Delete(':id')
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
@ApiOperation({ summary: 'Supprimer une absence (hard delete) — #172' })
|
||||
@ApiResponse({ status: 204 })
|
||||
async supprimer(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Param('id', ParseUUIDPipe) id: string,
|
||||
): Promise<void> {
|
||||
await this.absencesGardeService.supprimer(userId, role, id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { AbsencesGardeController } from './absences-garde.controller';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
||||
],
|
||||
controllers: [AbsencesGardeController],
|
||||
providers: [AbsencesGardeService],
|
||||
exports: [AbsencesGardeService],
|
||||
})
|
||||
export class AbsencesGardeModule {}
|
||||
@@ -0,0 +1,168 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||
import { ForbiddenException, BadRequestException } from '@nestjs/common';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
import {
|
||||
AbsencesGarde,
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
|
||||
describe('AbsencesGardeService (#172)', () => {
|
||||
let service: AbsencesGardeService;
|
||||
const absencesRepo = {
|
||||
create: jest.fn((x) => x),
|
||||
save: jest.fn(async (x) => ({
|
||||
...x,
|
||||
id: x.id ?? 'abs-1',
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
})),
|
||||
findOne: jest.fn(),
|
||||
delete: jest.fn(),
|
||||
createQueryBuilder: jest.fn(),
|
||||
};
|
||||
const amChildrenRepo = {
|
||||
find: jest.fn(),
|
||||
findOne: jest.fn(),
|
||||
};
|
||||
const parentsChildrenRepo = {
|
||||
find: jest.fn(),
|
||||
findOne: jest.fn(),
|
||||
};
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
AbsencesGardeService,
|
||||
{ provide: getRepositoryToken(AbsencesGarde), useValue: absencesRepo },
|
||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||
{
|
||||
provide: getRepositoryToken(ParentsChildren),
|
||||
useValue: parentsChildrenRepo,
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
service = module.get(AbsencesGardeService);
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
expect(service).toBeDefined();
|
||||
});
|
||||
|
||||
it('parent crée absence_enfant → statut accepte', async () => {
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-02',
|
||||
statut: StatutAbsenceGardeType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
placement: {
|
||||
enfantId: 'e-1',
|
||||
amId: 'am-1',
|
||||
child: { id: 'e-1', first_name: 'Léo' },
|
||||
am: { user: { prenom: 'Marie', nom: 'AM' } },
|
||||
},
|
||||
});
|
||||
|
||||
const res = await service.creer('p-1', RoleType.PARENT, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-02',
|
||||
});
|
||||
|
||||
expect(absencesRepo.save).toHaveBeenCalled();
|
||||
const savedArg = absencesRepo.save.mock.calls[0][0];
|
||||
expect(savedArg.statut).toBe(StatutAbsenceGardeType.ACCEPTE);
|
||||
expect(res.type).toBe(TypeAbsenceGardeType.ABSENCE_ENFANT);
|
||||
});
|
||||
|
||||
it('parent ne peut pas créer un congé AM', async () => {
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
await expect(
|
||||
service.creer('p-1', RoleType.PARENT, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.CONGE_AM,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-05',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(ForbiddenException);
|
||||
});
|
||||
|
||||
it('refus congé sans motif → BadRequest', async () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.CONGE_AM,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-05',
|
||||
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||
expire_at: new Date(),
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.maj('p-1', RoleType.PARENT, 'abs-1', {
|
||||
statut: StatutAbsenceGardeType.REFUSE,
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
|
||||
it('dates invalides → BadRequest', async () => {
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
await expect(
|
||||
service.creer('p-1', RoleType.PARENT, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-10',
|
||||
date_fin: '2026-10-01',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,420 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
ForbiddenException,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { In, IsNull, Repository } from 'typeorm';
|
||||
import {
|
||||
AbsencesGarde,
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
import {
|
||||
AbsenceGardeDto,
|
||||
CreerAbsenceGardeDto,
|
||||
ListeAbsencesGardeDto,
|
||||
MajAbsenceGardeDto,
|
||||
} from './dto/absences-garde.dto';
|
||||
|
||||
const TTL_EN_ATTENTE_MS = 15 * 24 * 60 * 60 * 1000;
|
||||
const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
||||
/** Sentinel « pas de purge » pour les périodes acceptées */
|
||||
const EXPIRE_ACCEPTE = new Date('9999-12-31T23:59:59.999Z');
|
||||
|
||||
@Injectable()
|
||||
export class AbsencesGardeService {
|
||||
constructor(
|
||||
@InjectRepository(AbsencesGarde)
|
||||
private readonly absencesRepo: Repository<AbsencesGarde>,
|
||||
@InjectRepository(AmChildren)
|
||||
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||
@InjectRepository(ParentsChildren)
|
||||
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||
) {}
|
||||
|
||||
async lister(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
opts: {
|
||||
placementId?: string;
|
||||
type?: TypeAbsenceGardeType;
|
||||
statut?: StatutAbsenceGardeType;
|
||||
from?: string;
|
||||
to?: string;
|
||||
},
|
||||
): Promise<ListeAbsencesGardeDto> {
|
||||
const placementIds = await this.resolvePlacementIds(
|
||||
userId,
|
||||
role,
|
||||
opts.placementId,
|
||||
);
|
||||
if (placementIds.length === 0) {
|
||||
return { items: [] };
|
||||
}
|
||||
|
||||
const qb = this.absencesRepo
|
||||
.createQueryBuilder('ag')
|
||||
.leftJoinAndSelect('ag.placement', 'placement')
|
||||
.leftJoinAndSelect('placement.child', 'child')
|
||||
.leftJoinAndSelect('placement.am', 'am')
|
||||
.leftJoinAndSelect('am.user', 'amUser')
|
||||
.where('ag.id_placement IN (:...placementIds)', { placementIds })
|
||||
.orderBy('ag.date_debut', 'DESC');
|
||||
|
||||
if (opts.type) {
|
||||
qb.andWhere('ag.type = :type', { type: opts.type });
|
||||
}
|
||||
if (opts.statut) {
|
||||
qb.andWhere('ag.statut = :statut', { statut: opts.statut });
|
||||
}
|
||||
if (opts.from) {
|
||||
qb.andWhere('ag.date_fin >= :from', { from: opts.from });
|
||||
}
|
||||
if (opts.to) {
|
||||
qb.andWhere('ag.date_debut <= :to', { to: opts.to });
|
||||
}
|
||||
|
||||
const rows = await qb.getMany();
|
||||
return { items: rows.map((r) => this.toDto(r)) };
|
||||
}
|
||||
|
||||
async creer(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
dto: CreerAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
this.assertDates(dto.date_debut, dto.date_fin);
|
||||
await this.assertCanAccessPlacement(userId, role, dto.id_placement);
|
||||
this.assertCanCreateType(role, dto.type);
|
||||
|
||||
const statut = this.statutInitial(dto.type);
|
||||
const entity = this.absencesRepo.create({
|
||||
id_placement: dto.id_placement,
|
||||
type: dto.type,
|
||||
date_debut: dto.date_debut,
|
||||
date_fin: dto.date_fin,
|
||||
statut,
|
||||
expire_at: this.expireAtFor(statut),
|
||||
cree_par: userId,
|
||||
motif: dto.motif?.trim() || undefined,
|
||||
});
|
||||
const saved = await this.absencesRepo.save(entity);
|
||||
return this.getByIdForUser(saved.id, userId, role);
|
||||
}
|
||||
|
||||
async maj(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
id: string,
|
||||
dto: MajAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
const row = await this.absencesRepo.findOne({ where: { id } });
|
||||
if (!row) {
|
||||
throw new NotFoundException('Absence introuvable');
|
||||
}
|
||||
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||
|
||||
if (dto.date_debut !== undefined || dto.date_fin !== undefined) {
|
||||
const debut = dto.date_debut ?? row.date_debut;
|
||||
const fin = dto.date_fin ?? row.date_fin;
|
||||
this.assertDates(debut, fin);
|
||||
// Parent : peut modifier ses absences enfant
|
||||
// AM : peut modifier congé/arrêt en_attente (avant accept) ou dates si créateur
|
||||
this.assertCanEditDates(role, row);
|
||||
row.date_debut = debut;
|
||||
row.date_fin = fin;
|
||||
if (row.statut === StatutAbsenceGardeType.EN_ATTENTE) {
|
||||
row.expire_at = this.expireAtFor(StatutAbsenceGardeType.EN_ATTENTE);
|
||||
}
|
||||
}
|
||||
|
||||
if (dto.statut !== undefined && dto.statut !== row.statut) {
|
||||
this.assertCanChangeStatut(role, row, dto.statut, dto.motif);
|
||||
if (
|
||||
dto.statut === StatutAbsenceGardeType.REFUSE &&
|
||||
(!dto.motif || !dto.motif.trim())
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'Une motivation est obligatoire en cas de refus',
|
||||
);
|
||||
}
|
||||
row.statut = dto.statut;
|
||||
row.expire_at = this.expireAtFor(dto.statut);
|
||||
if (dto.motif?.trim()) {
|
||||
row.motif = dto.motif.trim();
|
||||
}
|
||||
} else if (dto.motif !== undefined) {
|
||||
row.motif = dto.motif.trim() || undefined;
|
||||
}
|
||||
|
||||
await this.absencesRepo.save(row);
|
||||
return this.getByIdForUser(id, userId, role);
|
||||
}
|
||||
|
||||
async supprimer(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
id: string,
|
||||
): Promise<void> {
|
||||
const row = await this.absencesRepo.findOne({ where: { id } });
|
||||
if (!row) {
|
||||
throw new NotFoundException('Absence introuvable');
|
||||
}
|
||||
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||
|
||||
if (
|
||||
role === RoleType.PARENT &&
|
||||
row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT
|
||||
) {
|
||||
throw new ForbiddenException(
|
||||
'Un parent ne peut supprimer que les absences enfant',
|
||||
);
|
||||
}
|
||||
|
||||
await this.absencesRepo.delete({ id });
|
||||
}
|
||||
|
||||
private async getByIdForUser(
|
||||
id: string,
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
const row = await this.absencesRepo.findOne({
|
||||
where: { id },
|
||||
relations: ['placement', 'placement.child', 'placement.am', 'placement.am.user'],
|
||||
});
|
||||
if (!row) {
|
||||
throw new NotFoundException('Absence introuvable');
|
||||
}
|
||||
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||
return this.toDto(row);
|
||||
}
|
||||
|
||||
private statutInitial(type: TypeAbsenceGardeType): StatutAbsenceGardeType {
|
||||
if (type === TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||
return StatutAbsenceGardeType.ACCEPTE;
|
||||
}
|
||||
return StatutAbsenceGardeType.EN_ATTENTE;
|
||||
}
|
||||
|
||||
private expireAtFor(statut: StatutAbsenceGardeType): Date {
|
||||
const now = Date.now();
|
||||
if (statut === StatutAbsenceGardeType.ACCEPTE) {
|
||||
return EXPIRE_ACCEPTE;
|
||||
}
|
||||
if (statut === StatutAbsenceGardeType.REFUSE) {
|
||||
return new Date(now + TTL_REFUSE_MS);
|
||||
}
|
||||
return new Date(now + TTL_EN_ATTENTE_MS);
|
||||
}
|
||||
|
||||
private assertDates(debut: string, fin: string): void {
|
||||
if (fin < debut) {
|
||||
throw new BadRequestException(
|
||||
'date_fin doit être supérieure ou égale à date_debut',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private assertCanCreateType(role: RoleType, type: TypeAbsenceGardeType): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
if (type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||
throw new ForbiddenException(
|
||||
'Un parent ne peut créer que des absences enfant',
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
if (
|
||||
type !== TypeAbsenceGardeType.CONGE_AM &&
|
||||
type !== TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||
) {
|
||||
throw new ForbiddenException(
|
||||
'Une AM ne peut créer que congé ou arrêt maladie',
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
throw new ForbiddenException('Rôle non autorisé à créer une absence');
|
||||
}
|
||||
|
||||
private assertCanEditDates(
|
||||
role: RoleType,
|
||||
row: AbsencesGarde,
|
||||
): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
if (row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||
throw new ForbiddenException(
|
||||
'Un parent ne peut modifier que les absences enfant',
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
if (
|
||||
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||
) {
|
||||
if (
|
||||
row.statut !== StatutAbsenceGardeType.EN_ATTENTE &&
|
||||
row.statut !== StatutAbsenceGardeType.REFUSE &&
|
||||
row.statut !== StatutAbsenceGardeType.ACCEPTE
|
||||
) {
|
||||
throw new ForbiddenException('Statut incompatible avec une modification');
|
||||
}
|
||||
// Accepté : autorisé (S2b — re-validation via cartes plus tard ; API permet update dates)
|
||||
return;
|
||||
}
|
||||
throw new ForbiddenException('Type non modifiable par l’AM');
|
||||
}
|
||||
throw new ForbiddenException('Modification non autorisée');
|
||||
}
|
||||
|
||||
private assertCanChangeStatut(
|
||||
role: RoleType,
|
||||
row: AbsencesGarde,
|
||||
next: StatutAbsenceGardeType,
|
||||
_motif?: string,
|
||||
): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
// Accept / refuse congé ; ack arrêt (accepte)
|
||||
if (
|
||||
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||
) {
|
||||
if (
|
||||
next !== StatutAbsenceGardeType.ACCEPTE &&
|
||||
next !== StatutAbsenceGardeType.REFUSE
|
||||
) {
|
||||
throw new BadRequestException('Transition de statut invalide');
|
||||
}
|
||||
if (
|
||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM &&
|
||||
next === StatutAbsenceGardeType.REFUSE
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'Un arrêt maladie ne se refuse pas (accusé seulement)',
|
||||
);
|
||||
}
|
||||
if (row.statut !== StatutAbsenceGardeType.EN_ATTENTE) {
|
||||
throw new BadRequestException('Cette demande n’est plus en attente');
|
||||
}
|
||||
return;
|
||||
}
|
||||
throw new ForbiddenException(
|
||||
'Pas de changement de statut sur ce type pour un parent',
|
||||
);
|
||||
}
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
// Remise en attente après refus (republication)
|
||||
if (
|
||||
row.statut === StatutAbsenceGardeType.REFUSE &&
|
||||
next === StatutAbsenceGardeType.EN_ATTENTE
|
||||
) {
|
||||
return;
|
||||
}
|
||||
throw new ForbiddenException(
|
||||
'L’AM ne valide pas elle-même (sauf republication après refus)',
|
||||
);
|
||||
}
|
||||
throw new ForbiddenException('Changement de statut non autorisé');
|
||||
}
|
||||
|
||||
private async resolvePlacementIds(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
placementId?: string,
|
||||
): Promise<string[]> {
|
||||
if (placementId) {
|
||||
await this.assertCanAccessPlacement(userId, role, placementId);
|
||||
return [placementId];
|
||||
}
|
||||
|
||||
if (role === RoleType.PARENT) {
|
||||
const liens = await this.parentsChildrenRepo.find({
|
||||
where: { parentId: userId },
|
||||
select: ['enfantId'],
|
||||
});
|
||||
const enfantIds = liens.map((l) => l.enfantId);
|
||||
if (enfantIds.length === 0) return [];
|
||||
const placements = await this.amChildrenRepo.find({
|
||||
where: { enfantId: In(enfantIds), date_fin: IsNull() },
|
||||
select: ['id'],
|
||||
});
|
||||
return placements.map((p) => p.id);
|
||||
}
|
||||
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
const placements = await this.amChildrenRepo.find({
|
||||
where: { amId: userId, date_fin: IsNull() },
|
||||
select: ['id'],
|
||||
});
|
||||
return placements.map((p) => p.id);
|
||||
}
|
||||
|
||||
throw new ForbiddenException('Rôle non autorisé');
|
||||
}
|
||||
|
||||
private async assertCanAccessPlacement(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
placementId: string,
|
||||
): Promise<AmChildren> {
|
||||
const placement = await this.amChildrenRepo.findOne({
|
||||
where: { id: placementId, date_fin: IsNull() },
|
||||
});
|
||||
if (!placement) {
|
||||
throw new NotFoundException('Placement / couple introuvable ou inactif');
|
||||
}
|
||||
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
if (placement.amId !== userId) {
|
||||
throw new ForbiddenException('Ce placement ne vous appartient pas');
|
||||
}
|
||||
return placement;
|
||||
}
|
||||
|
||||
if (role === RoleType.PARENT) {
|
||||
const lien = await this.parentsChildrenRepo.findOne({
|
||||
where: { parentId: userId, enfantId: placement.enfantId },
|
||||
});
|
||||
if (!lien) {
|
||||
throw new ForbiddenException(
|
||||
'Ce placement ne concerne pas un de vos enfants',
|
||||
);
|
||||
}
|
||||
return placement;
|
||||
}
|
||||
|
||||
throw new ForbiddenException('Rôle non autorisé');
|
||||
}
|
||||
|
||||
private toDto(row: AbsencesGarde): AbsenceGardeDto {
|
||||
const child = row.placement?.child;
|
||||
const amUser = row.placement?.am?.user;
|
||||
return {
|
||||
id: row.id,
|
||||
id_placement: row.id_placement,
|
||||
type: row.type,
|
||||
date_debut: row.date_debut,
|
||||
date_fin: row.date_fin,
|
||||
statut: row.statut,
|
||||
expire_at: row.expire_at?.toISOString?.() ?? String(row.expire_at),
|
||||
cree_par: row.cree_par ?? null,
|
||||
motif: row.motif ?? null,
|
||||
id_enfant: child?.id ?? row.placement?.enfantId ?? null,
|
||||
prenom_enfant: child?.first_name ?? null,
|
||||
id_am: row.placement?.amId ?? null,
|
||||
prenom_am: amUser?.prenom ?? null,
|
||||
nom_am: amUser?.nom ?? null,
|
||||
cree_le: row.cree_le?.toISOString?.() ?? String(row.cree_le),
|
||||
modifie_le: row.modifie_le?.toISOString?.() ?? String(row.modifie_le),
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import {
|
||||
IsDateString,
|
||||
IsEnum,
|
||||
IsOptional,
|
||||
IsString,
|
||||
IsUUID,
|
||||
MaxLength,
|
||||
MinLength,
|
||||
} from 'class-validator';
|
||||
import {
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
|
||||
export class CreerAbsenceGardeDto {
|
||||
@ApiProperty({ description: 'Placement AM↔enfant (couple)' })
|
||||
@IsUUID()
|
||||
id_placement: string;
|
||||
|
||||
@ApiProperty({ enum: TypeAbsenceGardeType })
|
||||
@IsEnum(TypeAbsenceGardeType)
|
||||
type: TypeAbsenceGardeType;
|
||||
|
||||
@ApiProperty({ example: '2026-10-01' })
|
||||
@IsDateString()
|
||||
date_debut: string;
|
||||
|
||||
@ApiProperty({ example: '2026-10-05' })
|
||||
@IsDateString()
|
||||
date_fin: string;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(2000)
|
||||
motif?: string;
|
||||
}
|
||||
|
||||
export class MajAbsenceGardeDto {
|
||||
@ApiPropertyOptional({ example: '2026-10-02' })
|
||||
@IsOptional()
|
||||
@IsDateString()
|
||||
date_debut?: string;
|
||||
|
||||
@ApiPropertyOptional({ example: '2026-10-06' })
|
||||
@IsOptional()
|
||||
@IsDateString()
|
||||
date_fin?: string;
|
||||
|
||||
@ApiPropertyOptional({ enum: StatutAbsenceGardeType })
|
||||
@IsOptional()
|
||||
@IsEnum(StatutAbsenceGardeType)
|
||||
statut?: StatutAbsenceGardeType;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
description: 'Motivation de refus (parent) ou motif créateur',
|
||||
})
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MinLength(1)
|
||||
@MaxLength(2000)
|
||||
motif?: string;
|
||||
}
|
||||
|
||||
export class AbsenceGardeDto {
|
||||
@ApiProperty()
|
||||
id: string;
|
||||
|
||||
@ApiProperty()
|
||||
id_placement: string;
|
||||
|
||||
@ApiProperty({ enum: TypeAbsenceGardeType })
|
||||
type: TypeAbsenceGardeType;
|
||||
|
||||
@ApiProperty()
|
||||
date_debut: string;
|
||||
|
||||
@ApiProperty()
|
||||
date_fin: string;
|
||||
|
||||
@ApiProperty({ enum: StatutAbsenceGardeType })
|
||||
statut: StatutAbsenceGardeType;
|
||||
|
||||
@ApiProperty()
|
||||
expire_at: string;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
cree_par?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
motif?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
id_enfant?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
prenom_enfant?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
id_am?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
prenom_am?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
nom_am?: string | null;
|
||||
|
||||
@ApiProperty()
|
||||
cree_le: string;
|
||||
|
||||
@ApiProperty()
|
||||
modifie_le: string;
|
||||
}
|
||||
|
||||
export class ListeAbsencesGardeDto {
|
||||
@ApiProperty({ type: [AbsenceGardeDto] })
|
||||
items: AbsenceGardeDto[];
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
export { AbsencesGardeModule } from './absences-garde.module';
|
||||
export { AbsencesGardeService } from './absences-garde.service';
|
||||
@@ -0,0 +1,61 @@
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
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,7 +13,10 @@ describe('ParentsController', () => {
|
||||
createParentDossierStaff: jest.fn(),
|
||||
addCoParentStaff: jest.fn(),
|
||||
};
|
||||
const parentsServiceMock = {};
|
||||
const parentsServiceMock = {
|
||||
listerCouplesGarde: jest.fn(),
|
||||
definirCoupleGardeCourant: jest.fn(),
|
||||
};
|
||||
const userServiceMock = {};
|
||||
|
||||
beforeEach(async () => {
|
||||
@@ -39,6 +42,31 @@ describe('ParentsController', () => {
|
||||
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 () => {
|
||||
authServiceMock.createParentDossierStaff.mockResolvedValue({
|
||||
message: 'Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.',
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
Param,
|
||||
Patch,
|
||||
Post,
|
||||
Put,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import { ParentsService } from './parents.service';
|
||||
@@ -39,6 +40,8 @@ import { User } from 'src/common/decorators/user.decorator';
|
||||
import { PendingFamilyDto } from './dto/pending-family.dto';
|
||||
import { DossierFamilleCompletDto } from './dto/dossier-famille-complet.dto';
|
||||
import { mapParentForApi, mapParentsForApi } from './parents.mapper';
|
||||
import { CouplesGardeResponseDto } from './dto/couples-garde.dto';
|
||||
import { DefinirCoupleGardeCourantDto } from './dto/definir-couple-garde-courant.dto';
|
||||
|
||||
@ApiTags('Parents')
|
||||
@ApiBearerAuth('access-token')
|
||||
@@ -51,6 +54,39 @@ export class ParentsController {
|
||||
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)
|
||||
@Post('dossier')
|
||||
@HttpCode(HttpStatus.CREATED)
|
||||
|
||||
@@ -5,6 +5,7 @@ import { JwtModule } from '@nestjs/jwt';
|
||||
import { Parents } from 'src/entities/parents.entity';
|
||||
import { DossierFamille, DossierFamilleEnfant } from 'src/entities/dossier_famille.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsController } from './parents.controller';
|
||||
import { ParentsService } from './parents.service';
|
||||
import { Users } from 'src/entities/users.entity';
|
||||
@@ -13,7 +14,14 @@ import { AuthModule } from '../auth/auth.module';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([Parents, Users, DossierFamille, DossierFamilleEnfant, ParentsChildren]),
|
||||
TypeOrmModule.forFeature([
|
||||
Parents,
|
||||
Users,
|
||||
DossierFamille,
|
||||
DossierFamilleEnfant,
|
||||
ParentsChildren,
|
||||
AmChildren,
|
||||
]),
|
||||
forwardRef(() => UserModule),
|
||||
forwardRef(() => AuthModule),
|
||||
JwtModule.registerAsync({
|
||||
|
||||
@@ -1,12 +1,43 @@
|
||||
import { BadRequestException, NotFoundException } from '@nestjs/common';
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||
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', () => {
|
||||
describe('ParentsService — couples de garde (#168)', () => {
|
||||
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 () => {
|
||||
jest.clearAllMocks();
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [ParentsService],
|
||||
providers: [
|
||||
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();
|
||||
|
||||
service = module.get<ParentsService>(ParentsService);
|
||||
@@ -15,4 +46,107 @@ describe('ParentsService', () => {
|
||||
it('should be defined', () => {
|
||||
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,
|
||||
} from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { In, Repository } from 'typeorm';
|
||||
import { In, IsNull, Repository } from 'typeorm';
|
||||
import { Parents } from 'src/entities/parents.entity';
|
||||
import { DossierFamille } from 'src/entities/dossier_famille.entity';
|
||||
import { RoleType, Users } from 'src/entities/users.entity';
|
||||
@@ -20,6 +20,8 @@ import {
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { Children } from 'src/entities/children.entity';
|
||||
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()
|
||||
export class ParentsService {
|
||||
@@ -32,6 +34,8 @@ export class ParentsService {
|
||||
private readonly dossierFamilleRepository: Repository<DossierFamille>,
|
||||
@InjectRepository(ParentsChildren)
|
||||
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
||||
@InjectRepository(AmChildren)
|
||||
private readonly amChildrenRepository: Repository<AmChildren>,
|
||||
) {}
|
||||
|
||||
// Création d’un parent
|
||||
@@ -505,4 +509,108 @@ export class ParentsService {
|
||||
}
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
+45
-21
@@ -35,13 +35,15 @@ DO $$ BEGIN
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_avenant_type') THEN
|
||||
CREATE TYPE statut_avenant_type AS ENUM ('propose', 'accepte', 'refuse');
|
||||
END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_type') THEN
|
||||
CREATE TYPE type_evenement_type AS ENUM (
|
||||
'absence_enfant', 'conge_am', 'conge_parent', 'arret_maladie_am', 'evenement_rpe'
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type') THEN
|
||||
CREATE TYPE type_absence_garde_type AS ENUM (
|
||||
'absence_enfant', 'conge_am', 'arret_maladie_am'
|
||||
);
|
||||
END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_type') THEN
|
||||
CREATE TYPE statut_evenement_type AS ENUM ('propose', 'valide', 'refuse');
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type') THEN
|
||||
CREATE TYPE statut_absence_garde_type AS ENUM (
|
||||
'en_attente', 'accepte', 'refuse'
|
||||
);
|
||||
END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_validation_type') THEN
|
||||
CREATE TYPE statut_validation_type AS ENUM ('en_attente', 'valide', 'refuse');
|
||||
@@ -154,7 +156,10 @@ CREATE INDEX idx_assistantes_maternelles_numero_dossier
|
||||
CREATE TABLE parents (
|
||||
id_utilisateur UUID PRIMARY KEY REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
||||
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
|
||||
@@ -206,6 +211,16 @@ CREATE UNIQUE INDEX uq_enfant_garde_active
|
||||
ON enfants_assistantes_maternelles (id_enfant)
|
||||
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)
|
||||
-- ==========================================================
|
||||
@@ -294,25 +309,34 @@ CREATE TABLE avenants_contrats (
|
||||
);
|
||||
|
||||
-- ==========================================================
|
||||
-- Table : evenements
|
||||
-- Table : absences_garde (vérité métier absences/congés/arrêt)
|
||||
-- 1 ligne = 1 période ; rattachement = placement AM↔enfant (#193)
|
||||
-- ==========================================================
|
||||
CREATE TABLE evenements (
|
||||
CREATE TABLE absences_garde (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
type type_evenement_type,
|
||||
id_enfant UUID REFERENCES enfants(id) ON DELETE CASCADE,
|
||||
id_am UUID REFERENCES utilisateurs(id),
|
||||
id_parent UUID REFERENCES parents(id_utilisateur),
|
||||
cree_par UUID REFERENCES utilisateurs(id),
|
||||
date_debut TIMESTAMPTZ,
|
||||
date_fin TIMESTAMPTZ,
|
||||
commentaires TEXT,
|
||||
statut statut_evenement_type DEFAULT 'propose',
|
||||
delai_grace TIMESTAMPTZ,
|
||||
urgent BOOLEAN DEFAULT false,
|
||||
cree_le TIMESTAMPTZ DEFAULT now(),
|
||||
modifie_le TIMESTAMPTZ DEFAULT now()
|
||||
id_placement UUID NOT NULL
|
||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||
type type_absence_garde_type NOT NULL,
|
||||
date_debut DATE NOT NULL,
|
||||
date_fin DATE NOT NULL,
|
||||
statut statut_absence_garde_type NOT NULL DEFAULT 'en_attente',
|
||||
expire_at TIMESTAMPTZ NOT NULL,
|
||||
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||
id_card_instance UUID,
|
||||
motif TEXT,
|
||||
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
CONSTRAINT chk_absences_garde_dates CHECK (date_fin >= date_debut)
|
||||
);
|
||||
|
||||
CREATE INDEX idx_absences_garde_placement_dates
|
||||
ON absences_garde (id_placement, date_debut, date_fin);
|
||||
CREATE INDEX idx_absences_garde_placement_type_statut
|
||||
ON absences_garde (id_placement, type, statut);
|
||||
CREATE INDEX idx_absences_garde_expire_at
|
||||
ON absences_garde (expire_at)
|
||||
WHERE statut IN ('en_attente', 'refuse');
|
||||
|
||||
-- ==========================================================
|
||||
-- Table : signalements_bugs
|
||||
-- ==========================================================
|
||||
|
||||
+10
-10
@@ -104,31 +104,31 @@ Ce document recense **toutes les valeurs énumérées** utilisées dans la base
|
||||
|
||||
---
|
||||
|
||||
## 7) Type d’événement — `type`
|
||||
## 7) Type d’absence de garde — `type`
|
||||
|
||||
**Tables/colonnes** : `evenements.type`
|
||||
**Tables/colonnes** : `absences_garde.type`
|
||||
**Valeurs autorisées** :
|
||||
|
||||
| Valeur | Description |
|
||||
|---|---|
|
||||
| `absence_enfant` | Enfant absent |
|
||||
| `absence_enfant` | Absence déclarée par un parent |
|
||||
| `conge_am` | Congé de l’assistante maternelle |
|
||||
| `conge_parent` | Congé du parent |
|
||||
| `arret_maladie_am` | Arrêt maladie AM |
|
||||
| `evenement_rpe` | Événement RPE |
|
||||
|
||||
> Remplace l’ancien enum `type_evenement_type` / table `evenements` (supprimés ticket #193).
|
||||
|
||||
---
|
||||
|
||||
## 8) Statut d’événement — `statut`
|
||||
## 8) Statut d’absence de garde — `statut`
|
||||
|
||||
**Tables/colonnes** : `evenements.statut`
|
||||
**Tables/colonnes** : `absences_garde.statut`
|
||||
**Valeurs autorisées** :
|
||||
|
||||
| Valeur | Description |
|
||||
|---|---|
|
||||
| `propose` | Événement proposé |
|
||||
| `valide` | Événement validé |
|
||||
| `rejete` | Événement refusé |
|
||||
| `en_attente` | En attente de validation / ack |
|
||||
| `accepte` | Accepté / acté (conservé en historique métier) |
|
||||
| `refuse` | Refusé (temporaire ; purge TTL) |
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -42,10 +42,8 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
||||
| **contrats(id_dossier)** → `dossiers(id)` | **CASCADE** | 1:1, contrat détruit si dossier supprimé |
|
||||
| **avenants_contrats(id_contrat)** → `contrats(id)` | **CASCADE** | Avenants détruits avec le contrat |
|
||||
| **avenants_contrats(initie_par)** → `utilisateurs(id)` | **SET NULL** | Historiser l’avenant sans bloquer |
|
||||
| **evenements(id_enfant)** → `enfants(id)` | **CASCADE** | Événements n’ont plus de sens |
|
||||
| **evenements(id_am)** → `utilisateurs(id)` | **SET NULL** | Garder la trace même si AM supprimée |
|
||||
| **evenements(id_parent)** → `parents(id_utilisateur)` | **SET NULL** | Garder la trace si parent supprimé |
|
||||
| **evenements(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver l’historique de création |
|
||||
| **absences_garde(id_placement)** → `enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus d’absences |
|
||||
| **absences_garde(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver la période si user supprimé |
|
||||
| **signalements_bugs(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Conserver le ticket même si compte supprimé |
|
||||
| **uploads(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Fichier reste référencé sans l’auteur |
|
||||
| **notifications(id_utilisateur)** → `utilisateurs(id)` | **CASCADE** | Notifications propres à l’utilisateur |
|
||||
@@ -79,10 +77,8 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
||||
- `avenants_contrats.initie_par` → **SET NULL**
|
||||
|
||||
### Événements
|
||||
- `evenements.id_enfant` → **CASCADE**
|
||||
- `evenements.id_am` → **SET NULL**
|
||||
- `evenements.id_parent` → **SET NULL**
|
||||
- `evenements.cree_par` → **SET NULL**
|
||||
- `absences_garde.id_placement` → **CASCADE**
|
||||
- `absences_garde.cree_par` → **SET NULL**
|
||||
|
||||
### Divers
|
||||
- `signalements_bugs.id_utilisateur` → **SET NULL**
|
||||
@@ -109,11 +105,11 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
||||
|
||||
4. **Suppression d’un enfant**
|
||||
- Supprimer `enfants(id=childA)`
|
||||
- Attendu : `enfants_parents` (CASCADE), `dossiers` du childA (CASCADE), `evenements` du childA (CASCADE).
|
||||
- Attendu : `enfants_parents` (CASCADE), `dossiers` du childA (CASCADE), `absences_garde` des placements du childA (CASCADE via EAM).
|
||||
|
||||
5. **Suppression d’un utilisateur AM**
|
||||
- Supprimer `utilisateurs(id=amB)`
|
||||
- Attendu : `evenements.id_am` devient **NULL** (historique conservé).
|
||||
- Attendu : absences liées via placement AM (CASCADE si le lien EAM est retiré).
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
-- Ticket #193 — Back métier absences / congés / arrêt (périodes par placement)
|
||||
-- Idempotent : safe à rejouer.
|
||||
-- Remplace la table legacy `evenements` (mal conçue, non utilisée en API).
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- Enums
|
||||
-- ---------------------------------------------------------------------------
|
||||
DO $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type') THEN
|
||||
CREATE TYPE type_absence_garde_type AS ENUM (
|
||||
'absence_enfant',
|
||||
'conge_am',
|
||||
'arret_maladie_am'
|
||||
);
|
||||
END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type') THEN
|
||||
CREATE TYPE statut_absence_garde_type AS ENUM (
|
||||
'en_attente',
|
||||
'accepte',
|
||||
'refuse'
|
||||
);
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- Table absences_garde (1 ligne = 1 période)
|
||||
-- ---------------------------------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS absences_garde (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
id_placement UUID NOT NULL
|
||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||
type type_absence_garde_type NOT NULL,
|
||||
date_debut DATE NOT NULL,
|
||||
date_fin DATE NOT NULL,
|
||||
statut statut_absence_garde_type NOT NULL DEFAULT 'en_attente',
|
||||
-- TTL purge : obligatoire ; pour statut=accepte utiliser 'infinity' (pas de purge métier)
|
||||
expire_at TIMESTAMPTZ NOT NULL,
|
||||
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||
id_card_instance UUID NULL,
|
||||
motif TEXT,
|
||||
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
CONSTRAINT chk_absences_garde_dates CHECK (date_fin >= date_debut)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_absences_garde_placement_dates
|
||||
ON absences_garde (id_placement, date_debut, date_fin);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_absences_garde_placement_type_statut
|
||||
ON absences_garde (id_placement, type, statut);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_absences_garde_expire_at
|
||||
ON absences_garde (expire_at)
|
||||
WHERE statut IN ('en_attente', 'refuse');
|
||||
|
||||
COMMENT ON TABLE absences_garde IS
|
||||
'Vérité métier des absences/congés/arrêts par couple AM↔enfant (placement). Les cartes collectent ; cette table stocke.';
|
||||
COMMENT ON COLUMN absences_garde.expire_at IS
|
||||
'Purge auto (job ultérieur) pour en_attente/refuse. accepte → infinity.';
|
||||
COMMENT ON COLUMN absences_garde.id_card_instance IS
|
||||
'Réf. carte de collecte (FK cards quand le module Cartes existera).';
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- Drop legacy evenements (+ enums si plus référencés)
|
||||
-- ---------------------------------------------------------------------------
|
||||
DROP TABLE IF EXISTS evenements CASCADE;
|
||||
|
||||
DO $$
|
||||
BEGIN
|
||||
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_type')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE udt_name = 'type_evenement_type'
|
||||
) THEN
|
||||
DROP TYPE type_evenement_type;
|
||||
END IF;
|
||||
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_type')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE udt_name = 'statut_evenement_type'
|
||||
) THEN
|
||||
DROP TYPE statut_evenement_type;
|
||||
END IF;
|
||||
END $$;
|
||||
@@ -0,0 +1,10 @@
|
||||
-- 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;
|
||||
@@ -161,23 +161,9 @@ VALUES (
|
||||
ON CONFLICT (id) DO NOTHING;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- Événement (absence enfant)
|
||||
-- Absences_garde : seeds quand placements EAM présents (API / ticket peuplement)
|
||||
-- Legacy evenements supprimée (#193).
|
||||
-- ------------------------------------------------------------
|
||||
INSERT INTO evenements (id, type, id_enfant, id_am, id_parent, cree_par, date_debut, date_fin, commentaires, statut, urgence)
|
||||
VALUES (
|
||||
'e0000000-0000-0000-0000-000000000001',
|
||||
'absence_enfant',
|
||||
'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
|
||||
'66666666-6666-6666-6666-666666666666',
|
||||
'33333333-3333-3333-3333-333333333333',
|
||||
'33333333-3333-3333-3333-333333333333',
|
||||
'2025-09-12',
|
||||
'2025-09-12',
|
||||
'Enfant malade (rhume).',
|
||||
'propose',
|
||||
false
|
||||
)
|
||||
ON CONFLICT (id) DO NOTHING;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- Upload (justificatif lié au dossier)
|
||||
|
||||
@@ -79,12 +79,11 @@ LEFT JOIN avenants_contrats a ON a.id_contrat = c.id
|
||||
GROUP BY c.id, c.id_dossier, c.statut
|
||||
ORDER BY c.cree_le DESC;
|
||||
|
||||
\echo '=== 9) Evénements par enfant (30 derniers jours) =============='
|
||||
SELECT ev.id, ev.type, ev.id_enfant, e.prenom AS enfant, ev.date_debut, ev.date_fin, ev.statut
|
||||
FROM evenements ev
|
||||
JOIN enfants e ON e.id = ev.id_enfant
|
||||
WHERE ev.date_debut >= (NOW()::date - INTERVAL '30 days')
|
||||
ORDER BY ev.date_debut DESC;
|
||||
\echo '=== 9) Absences_garde (30 derniers jours) ====================='
|
||||
SELECT ag.id, ag.type, ag.id_placement, ag.date_debut, ag.date_fin, ag.statut, ag.expire_at
|
||||
FROM absences_garde ag
|
||||
WHERE ag.date_debut >= (NOW()::date - INTERVAL '30 days')
|
||||
ORDER BY ag.date_debut DESC;
|
||||
|
||||
\echo '=== 10) Uploads & notifications récentes ======================='
|
||||
SELECT u.courriel, up.fichier_url, up.type_fichier, up.cree_le
|
||||
@@ -135,11 +134,11 @@ FROM avenants_contrats a
|
||||
LEFT JOIN contrats c ON c.id = a.id_contrat
|
||||
WHERE c.id IS NULL;
|
||||
|
||||
-- Evénements sans enfant
|
||||
SELECT ev.*
|
||||
FROM evenements ev
|
||||
LEFT JOIN enfants e ON e.id = ev.id_enfant
|
||||
WHERE e.id IS NULL;
|
||||
-- Absences sans placement
|
||||
SELECT ag.*
|
||||
FROM absences_garde ag
|
||||
LEFT JOIN enfants_assistantes_maternelles eam ON eam.id = ag.id_placement
|
||||
WHERE eam.id IS NULL;
|
||||
|
||||
\echo '=== 13) Performance : EXPLAIN sur requêtes clés ==============='
|
||||
|
||||
@@ -151,12 +150,12 @@ WHERE m.id_dossier = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
|
||||
ORDER BY m.cree_le DESC
|
||||
LIMIT 20;
|
||||
|
||||
-- Evénements par enfant et période (idx_evenements_id_enfant_date_debut)
|
||||
-- Absences par placement et période (idx_absences_garde_placement_dates)
|
||||
EXPLAIN ANALYZE
|
||||
SELECT ev.*
|
||||
FROM evenements ev
|
||||
WHERE ev.id_enfant = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
|
||||
AND ev.date_debut >= '2025-01-01';
|
||||
SELECT ag.*
|
||||
FROM absences_garde ag
|
||||
WHERE ag.id_placement IS NOT NULL
|
||||
AND ag.date_debut >= '2025-01-01';
|
||||
|
||||
-- Notifications non lues (idx_notifications_user_lu_cree_le)
|
||||
EXPLAIN ANALYZE
|
||||
@@ -199,7 +198,7 @@ SELECT
|
||||
(SELECT COUNT(*) FROM messages) AS nb_messages,
|
||||
(SELECT COUNT(*) FROM contrats) AS nb_contrats,
|
||||
(SELECT COUNT(*) FROM avenants_contrats) AS nb_avenants,
|
||||
(SELECT COUNT(*) FROM evenements) AS nb_evenements,
|
||||
(SELECT COUNT(*) FROM absences_garde) AS nb_absences_garde,
|
||||
(SELECT COUNT(*) FROM uploads) AS nb_uploads,
|
||||
(SELECT COUNT(*) FROM notifications) AS nb_notifications,
|
||||
(SELECT COUNT(*) FROM validations) AS nb_validations;
|
||||
|
||||
+41
-12
@@ -1,7 +1,7 @@
|
||||
# 📋 Décisions Projet - P'titsPas
|
||||
|
||||
**Version** : 1.2
|
||||
**Date** : 16 Juin 2026
|
||||
**Version** : 1.4
|
||||
**Date** : 24 Septembre 2026
|
||||
**Auteur** : Équipe PtitsPas
|
||||
|
||||
---
|
||||
@@ -465,19 +465,34 @@ docs/
|
||||
|
||||
---
|
||||
|
||||
### 26. Branches Git
|
||||
### 26. Branches Git + merge squash (norme)
|
||||
|
||||
**Décision** : ✅ **Stratégie simple : master + feature branches**
|
||||
**Décision** : ✅ **`develop` + `master` + `feature/*`, merges en squash**
|
||||
|
||||
**Justification** :
|
||||
- Simplicité (petite équipe)
|
||||
- Flexibilité
|
||||
- Historique lisible sur `develop` / `master` (1 commit = 1 ticket)
|
||||
- Déploiement prod uniquement depuis `master`
|
||||
|
||||
**Branches** :
|
||||
- `master` : Production
|
||||
- `archive/*` : Archives (ex: maquette initiale)
|
||||
- `migration/*` : Migrations (ex: intégration YNOV)
|
||||
- `feature/*` : Nouvelles fonctionnalités
|
||||
- `master` : Production (déploiement auto)
|
||||
- `develop` : Intégration / recette
|
||||
- `feature/*` : Ticket en cours (depuis `develop`)
|
||||
- `archive/*`, `migration/*` : Archives / migrations ponctuelles
|
||||
|
||||
**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"}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
@@ -555,6 +570,19 @@ docs/
|
||||
|
||||
---
|
||||
|
||||
### 32. Module Absences + Cartes (séparation back / collecte)
|
||||
|
||||
**Décision** : ✅ **Back `absences_garde` = vérité métier** ; **Cartes = file d’attention / collecte** (plugin isolé). Types SYSTEM (absence, congé, arrêt) indéboulonnables ; types OPTIONNELS (sondages…) plus tard. Annulation = DELETE. `expire_at` dès V1.
|
||||
|
||||
**Justification** :
|
||||
- Premier vrai module d’interaction multi-acteurs
|
||||
- Évite de stocker l’historique congés dans des bulles éphémères
|
||||
- Portabilité / généricité des cartes sans coupler le métier garde
|
||||
|
||||
**Flux V1** : BDD absences → API liste/CRUD → module Cartes SYSTEM → front bulles (séparé).
|
||||
|
||||
---
|
||||
|
||||
## 📋 Résumé des décisions critiques
|
||||
|
||||
| # | Décision | Statut | Impact |
|
||||
@@ -575,6 +603,7 @@ docs/
|
||||
| 14 | Migration données | ❌ Rejeté | N/A |
|
||||
| 15 | Doc utilisateur | ⏸️ Phase 2 | Formation |
|
||||
| 31 | Logs Winston | ✅ Phase 1 | Monitoring |
|
||||
| 32 | Absences back + Cartes collecte | ✅ 0.2.0 | Métier / archi |
|
||||
| 5bis | Familles recomposées — 2ᵉ compte v1.0.0 | ✅ v1.0.0 | Métier / dossier |
|
||||
|
||||
---
|
||||
@@ -586,11 +615,11 @@ docs/
|
||||
| 25/11/2025 | 1.0 | Création du document - Toutes les décisions initiales |
|
||||
| 09/02/2026 | 1.1 | Configuration initiale : un seul panneau Paramètres (3 sections) dans le dashboard, plus de Setup Wizard dédié ; navigation bloquée jusqu'à sauvegarde |
|
||||
| 16/06/2026 | 1.2 | Décision 5bis — familles recomposées, contournement v1.0.0 ; lien doc [28](./28_EVOLUTION-FAMILLE-ET-RESPONSABLES.md) |
|
||||
| 16/06/2026 | 1.3 | Précision 5bis — cible post-1.0.0 : parcours gestionnaire § 7.5 (#139), visibilité par enfant |
|
||||
| 24/09/2026 | 1.4 | Décision 32 — Absences (`absences_garde`) ≠ Cartes ; Epic C recentré ; drop `evenements` |
|
||||
|
||||
---
|
||||
|
||||
**Dernière mise à jour** : 16 Juin 2026
|
||||
**Version** : 1.2
|
||||
**Dernière mise à jour** : 24 Septembre 2026
|
||||
**Version** : 1.4
|
||||
**Statut** : ✅ Document validé
|
||||
|
||||
|
||||
@@ -116,10 +116,17 @@ curl -s -H "Authorization: token $GITEA_TOKEN" \
|
||||
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls?state=open" | jq .
|
||||
|
||||
# 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" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"head":"develop","base":"master","title":"Titre de la PR"}' \
|
||||
-d '{"head":"feature/XX-nom","base":"develop","title":"feat(#XX): Titre","body":"Closes #XX"}' \
|
||||
"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
|
||||
|
||||
@@ -194,6 +194,9 @@ frontend/lib/
|
||||
|
||||
## 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
|
||||
# 1. Créer une branche feature
|
||||
git checkout develop
|
||||
@@ -204,15 +207,22 @@ git checkout -b feature/XX-nom-ticket
|
||||
git add .
|
||||
git commit -m "feat(#XX): Description courte"
|
||||
|
||||
# 3. Pousser et créer PR
|
||||
# 3. Pousser et créer PR vers develop
|
||||
git push -u origin feature/XX-nom-ticket
|
||||
|
||||
# 4. Créer PR vers master via Gitea ou API
|
||||
# 4. Créer PR (base = develop)
|
||||
curl -X POST \
|
||||
-H "Authorization: token giteabu_1796c6aace0e2ef7e4fdb49cdc3bc1bf8ee31fbc" \
|
||||
-H "Authorization: token $GITEA_TOKEN" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"title":"feat(#XX): Titre","body":"Description\n\nCloses #XX","head":"feature/XX-nom-ticket","base":"master"}' \
|
||||
-d '{"title":"feat(#XX): Titre","body":"Description\n\nCloses #XX","head":"feature/XX-nom-ticket","base":"develop"}' \
|
||||
"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"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# Découpage tickets — Quotidien parent / AM
|
||||
|
||||
> **Statut :** backlog Gitea créé (**milestone `0.2.0`**, **#165–#189**) — *création anticipée avant validation PO* ; **descriptions enrichies** ensuite à partir de la mini-spec / découpage.
|
||||
> **Statut :** backlog Gitea **0.2.0** / épic [#165](https://git.ptits-pas.fr/jmartin/petitspas/issues/165) — architecture absences + cartes recentrée (sept. 2026).
|
||||
> **Réf. visuelle :** [maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png](./maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png)
|
||||
> **Mini-spec :** [31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md](./31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md)
|
||||
> **Règle :** tickets **front** / **back** séparés · widgets partagés parent↔AM · **pas d’implé code** tant que le PO n’a pas validé le backlog.
|
||||
> **Décision :** [24_DECISIONS-PROJET.md](./24_DECISIONS-PROJET.md) §32 (Cartes ≠ back Absences).
|
||||
|
||||
## Intention produit (rappel)
|
||||
|
||||
@@ -96,22 +96,31 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
||||
|
||||
---
|
||||
|
||||
## Epic C — Cartes (file du quotidien)
|
||||
## Epic C — Absences + Cartes (file d’attention)
|
||||
|
||||
### C1 — [Back] Modèle + API cartes / événements de garde
|
||||
Types V1 : absence enfant, congé AM, maladie AM (« arrêt »), sortie à valider. CRUD / transitions de statut ; liaison couple / agenda (hook minimal). Règles : absence enfant sans veto AM ; congé AM accepter/refuser (**1 parent suffit**) ; maladie AM accusé parent ; sortie **1 parent suffit**. Aucun doc médical stocké.
|
||||
**Séparation :** back **`absences_garde`** = vérité métier (périodes / placement) ; module **Cartes** = collecte / bulles / workflow. Annulation = DELETE. `expire_at` dès le modèle.
|
||||
|
||||
### C2 — [Front] Flux de cartes colonne gauche (parent)
|
||||
Liste scroll pastel (palette `assets/cards/` — 7 couleurs) ; ouverture détail ; actions valider / refuser / accusé selon type. Bouton **Déclarer une absence** (+ autres actions TBD plus tard).
|
||||
### Back (ordre)
|
||||
|
||||
### C3 — [Front] Flux de cartes colonne gauche (AM)
|
||||
Miroir : création congé / maladie / sortie ; lecture absences enfants du jour / à venir.
|
||||
| Étape | Contenu |
|
||||
|-------|---------|
|
||||
| BDD | Table `absences_garde` + drop `evenements` |
|
||||
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
||||
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
||||
| Realtime | WS/SSE bulles |
|
||||
| Purge TTL | Job `expire_at` / `purge_at` |
|
||||
|
||||
### C4 — [Front] Formulaire déclarer une absence (parent)
|
||||
Saisie période (+ motif léger si besoin) → crée une carte côté AM.
|
||||
### Front (après API — hors chantier back immédiat)
|
||||
|
||||
### C5 — [Front] Formulaires AM congé / maladie / sortie
|
||||
Création des cartes correspondantes + ciblage enfants si sortie.
|
||||
| Ticket | Contenu |
|
||||
|--------|---------|
|
||||
| Feed parent / AM | File d’attention bulles (widget partagé) |
|
||||
| Modale « Ajouter une bulle » | Générique + absence parent / congé·arrêt AM |
|
||||
| Agenda | Consommer GET liste (lignes) |
|
||||
|
||||
### Hors V1 cartes
|
||||
|
||||
Sondages / catalogue admin OPTIONNEL / sortie riche / desktop 2 panneaux (évolution séparée).
|
||||
|
||||
---
|
||||
|
||||
@@ -185,13 +194,15 @@ Scripts / seeds : foyer 2 parents, AM, enfant(s), quelques cartes, posts blog, f
|
||||
|
||||
## Ordre de réalisation suggéré
|
||||
|
||||
1. **A1 → A2 → A3** (coquille + contexte parent)
|
||||
2. **C1 → C2 / C4** (premières cartes utiles)
|
||||
3. **D1 → D2 / D3** (blog central)
|
||||
4. **E1 → E2 → E4** (messagerie AM)
|
||||
5. **B1 → B2 → B3** + miroirs C3/C5/D3/E5 (AM)
|
||||
6. **E3 / E5 / E6 / D4** (RPE)
|
||||
7. **F1 → F2** + **G1** (nav, mobile, seeds)
|
||||
1. **A1 → A2 → A3** (coquille + contexte parent) — *fait*
|
||||
2. **BDD absences → API absences** puis **Cartes SYSTEM** (congés/absences/arrêt)
|
||||
3. **Feed / modale bulles** (front) + agenda lignes
|
||||
4. **D1 → D2 / D3** (blog)
|
||||
5. **E1 → E2 → E4** (messagerie AM)
|
||||
6. **B1 → B2 → B3** + miroirs AM
|
||||
7. Realtime / purge TTL / RPE / F/G
|
||||
|
||||
Desktop 2 panneaux (cartes prioritaires sur blog) = **évolution hors 0.2.0**.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -61,14 +61,20 @@ Bandeau : **TdB** · **Agenda** · **Contrat** · menu user (recherche AM, param
|
||||
| **Mess. AM** | Chat foyer ↔ AM (style WhatsApp : texte, emoji, images) |
|
||||
| **Mess. RPE** | Privée par défaut ; ajout de participants pour médiation / conflit |
|
||||
|
||||
## 5. Règles métier V1
|
||||
## 5. Règles métier V1 (absences / congés)
|
||||
|
||||
| Type | Qui initie | Validation |
|
||||
|------|------------|------------|
|
||||
| Absence enfant | Parent | Pas de veto AM |
|
||||
| Congé AM | AM | **1 parent** accepte ou refuse |
|
||||
| Maladie AM | AM | Parent accuse réception (pas de doc médical in-app) |
|
||||
| Sortie | AM / RPE | **1 parent** suffit (présence / absence) ; explication aussi via blog |
|
||||
| Type | Qui initie | Validation / effet |
|
||||
|------|------------|-------------------|
|
||||
| Absence enfant | Parent | Pas de veto AM ; période **acceptée** tout de suite ; bulle info AM |
|
||||
| Congé AM | AM | **1 parent** accepte **ou** refuse (+ motivation) → bounce AM (modif/renvoi ou DELETE) |
|
||||
| Modification congé AM déjà accepté | AM | Même `id` absence ; re-validation parents ; dates actives = anciennes tant qu’en attente |
|
||||
| Modification absence enfant | Parent | Update immédiat + bulle **ack** AM (OK) |
|
||||
| Maladie AM | AM | Parent **ack** (« bien reçu ») ; **aucun** doc médical |
|
||||
| Sortie / sondage | — | **Plus tard** (types optionnels) |
|
||||
|
||||
**Stockage :** table `absences_garde` (1 ligne = période, `id_placement`, `expire_at`). Les **cartes** collectent ; elles ne sont pas la source de vérité. Annulation = DELETE.
|
||||
|
||||
**Péremption cartes :** mémoire courte (`retention_days` / `purge_at`) — pas un historique de vie (≠ messagerie).
|
||||
|
||||
- Mess. AM : les **2 parents** voient le **même** fil — **pas** de masquage V1
|
||||
- Blog auteurs V1 : **AM** + **gestionnaire (RPE)** — parent auteur = plus tard
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 216 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 249 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 277 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 171 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 290 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 239 KiB |
@@ -0,0 +1,113 @@
|
||||
/// Modèles du couple de garde (enfant ↔ AM) — ticket #167.
|
||||
/// Contrat backend #168 : GET /parents/me/couples-garde.
|
||||
|
||||
/// Identité minimale d'une personne du couple (enfant, AM ou parent).
|
||||
class CoupleMembre {
|
||||
final String id;
|
||||
final String? prenom;
|
||||
final String? nom;
|
||||
final String? photoUrl;
|
||||
|
||||
const CoupleMembre({
|
||||
required this.id,
|
||||
this.prenom,
|
||||
this.nom,
|
||||
this.photoUrl,
|
||||
});
|
||||
|
||||
/// Nom d'affichage : prénom seul si dispo, sinon « Prénom Nom », sinon repli.
|
||||
String displayName({String fallback = ''}) {
|
||||
final p = (prenom ?? '').trim();
|
||||
final n = (nom ?? '').trim();
|
||||
if (p.isNotEmpty && n.isNotEmpty) return '$p $n';
|
||||
if (p.isNotEmpty) return p;
|
||||
if (n.isNotEmpty) return n;
|
||||
return fallback;
|
||||
}
|
||||
|
||||
factory CoupleMembre.fromJson(Map<String, dynamic> json) {
|
||||
return CoupleMembre(
|
||||
id: (json['id'] ?? '').toString(),
|
||||
prenom: json['prenom']?.toString(),
|
||||
nom: json['nom']?.toString(),
|
||||
photoUrl: json['photo_url']?.toString(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Un couple de garde = placement actif enfant ↔ AM.
|
||||
class CoupleGarde {
|
||||
final String id;
|
||||
final CoupleMembre enfant;
|
||||
final CoupleMembre am;
|
||||
final bool courant;
|
||||
|
||||
const CoupleGarde({
|
||||
required this.id,
|
||||
required this.enfant,
|
||||
required this.am,
|
||||
this.courant = false,
|
||||
});
|
||||
|
||||
factory CoupleGarde.fromJson(Map<String, dynamic> json) {
|
||||
return CoupleGarde(
|
||||
id: (json['id'] ?? '').toString(),
|
||||
enfant: CoupleMembre.fromJson(
|
||||
Map<String, dynamic>.from(json['enfant'] ?? const {}),
|
||||
),
|
||||
am: CoupleMembre.fromJson(
|
||||
Map<String, dynamic>.from(json['am'] ?? const {}),
|
||||
),
|
||||
courant: json['courant'] == true,
|
||||
);
|
||||
}
|
||||
|
||||
CoupleGarde copyWith({bool? courant}) {
|
||||
return CoupleGarde(
|
||||
id: id,
|
||||
enfant: enfant,
|
||||
am: am,
|
||||
courant: courant ?? this.courant,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Réponse de l'API couples de garde (liste + id du couple courant).
|
||||
class CouplesGardeResponse {
|
||||
final List<CoupleGarde> couples;
|
||||
final String? coupleCourantId;
|
||||
|
||||
const CouplesGardeResponse({
|
||||
required this.couples,
|
||||
this.coupleCourantId,
|
||||
});
|
||||
|
||||
bool get isEmpty => couples.isEmpty;
|
||||
bool get isUnique => couples.length == 1;
|
||||
|
||||
/// Couple courant : celui marqué `courant`, sinon celui de [coupleCourantId],
|
||||
/// sinon le premier (repli implicite côté client, prévu par le back).
|
||||
CoupleGarde? get coupleCourant {
|
||||
if (couples.isEmpty) return null;
|
||||
for (final c in couples) {
|
||||
if (c.courant) return c;
|
||||
}
|
||||
if (coupleCourantId != null) {
|
||||
for (final c in couples) {
|
||||
if (c.id == coupleCourantId) return c;
|
||||
}
|
||||
}
|
||||
return couples.first;
|
||||
}
|
||||
|
||||
factory CouplesGardeResponse.fromJson(Map<String, dynamic> json) {
|
||||
final list = (json['couples'] as List?) ?? const [];
|
||||
return CouplesGardeResponse(
|
||||
couples: list
|
||||
.whereType<Map>()
|
||||
.map((e) => CoupleGarde.fromJson(Map<String, dynamic>.from(e)))
|
||||
.toList(),
|
||||
coupleCourantId: json['couple_courant_id']?.toString(),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,14 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:p_tits_pas/models/couple_garde.dart';
|
||||
import 'package:p_tits_pas/models/user.dart';
|
||||
import 'package:p_tits_pas/services/auth_service.dart';
|
||||
import 'package:p_tits_pas/services/couple_garde_service.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||
|
||||
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
|
||||
/// Colonne gauche : sélecteur de couple enfant–nounou (#167).
|
||||
/// Métier cartes / blog / messagerie : tickets C/D/E.
|
||||
class ParentDashboardScreen extends StatefulWidget {
|
||||
const ParentDashboardScreen({super.key});
|
||||
@@ -17,10 +21,16 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
||||
QuotidienNavSection _section = QuotidienNavSection.liaison;
|
||||
AppUser? _user;
|
||||
|
||||
List<CoupleGarde> _couples = const [];
|
||||
String? _selectedCoupleId;
|
||||
bool _couplesLoading = true;
|
||||
String? _couplesError;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_loadUser();
|
||||
_loadCouples();
|
||||
}
|
||||
|
||||
Future<void> _loadUser() async {
|
||||
@@ -28,6 +38,52 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
||||
if (mounted) setState(() => _user = user);
|
||||
}
|
||||
|
||||
Future<void> _loadCouples() async {
|
||||
setState(() {
|
||||
_couplesLoading = true;
|
||||
_couplesError = null;
|
||||
});
|
||||
try {
|
||||
final res = await CoupleGardeService.getCouplesGarde();
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_couples = res.couples;
|
||||
_selectedCoupleId = res.coupleCourant?.id;
|
||||
_couplesLoading = false;
|
||||
});
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_couplesError = e.toString().replaceFirst('Exception: ', '');
|
||||
_couplesLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _selectCouple(CoupleGarde couple) async {
|
||||
if (couple.id == _selectedCoupleId) return;
|
||||
// Optimiste : on bascule tout de suite, l'API persiste ensuite.
|
||||
setState(() => _selectedCoupleId = couple.id);
|
||||
try {
|
||||
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_couples = res.couples;
|
||||
_selectedCoupleId = res.coupleCourant?.id ?? couple.id;
|
||||
});
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
'Impossible de changer de garde : '
|
||||
'${e.toString().replaceFirst('Exception: ', '')}',
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
String get _displayName {
|
||||
final n = _user?.fullName.trim() ?? '';
|
||||
if (n.isNotEmpty) return n;
|
||||
@@ -52,11 +108,13 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
||||
onProfileTap: () => _soon('Profil'),
|
||||
onSearchAmTap: () => _soon('Recherche AM'),
|
||||
onSettingsTap: () => _soon('Paramètres'),
|
||||
leftColumn: const QuotidienColumnPlaceholder(
|
||||
title: 'Cartes',
|
||||
subtitle:
|
||||
'Couple enfant–nounou et flux de cartes\n(à brancher — tickets #167 / #173).',
|
||||
icon: Icons.style_outlined,
|
||||
leftColumn: _LeftColumn(
|
||||
couples: _couples,
|
||||
selectedCoupleId: _selectedCoupleId,
|
||||
loading: _couplesLoading,
|
||||
error: _couplesError,
|
||||
onRetry: _loadCouples,
|
||||
onCoupleSelected: _selectCouple,
|
||||
),
|
||||
centerColumn: const QuotidienColumnPlaceholder(
|
||||
title: 'Blog',
|
||||
@@ -81,3 +139,51 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173 à venir).
|
||||
class _LeftColumn extends StatelessWidget {
|
||||
final List<CoupleGarde> couples;
|
||||
final String? selectedCoupleId;
|
||||
final bool loading;
|
||||
final String? error;
|
||||
final VoidCallback onRetry;
|
||||
final ValueChanged<CoupleGarde> onCoupleSelected;
|
||||
|
||||
const _LeftColumn({
|
||||
required this.couples,
|
||||
required this.selectedCoupleId,
|
||||
required this.loading,
|
||||
required this.error,
|
||||
required this.onRetry,
|
||||
required this.onCoupleSelected,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(14),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
CoupleSelectorBandeau(
|
||||
couples: couples,
|
||||
selectedCoupleId: selectedCoupleId,
|
||||
loading: loading,
|
||||
errorMessage: error,
|
||||
onRetry: onRetry,
|
||||
onCoupleSelected: onCoupleSelected,
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
const Expanded(
|
||||
child: QuotidienColumnPlaceholder(
|
||||
title: 'Cartes',
|
||||
subtitle:
|
||||
'Absences, congés AM, sorties à valider\n(à brancher — ticket #173).',
|
||||
icon: Icons.style_outlined,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,6 +62,10 @@ class ApiConfig {
|
||||
static const String parents = '/parents';
|
||||
/// Création dossier famille actif par le staff (#129) — body type register parent.
|
||||
static const String parentsDossier = '/parents/dossier';
|
||||
/// Couples de garde du parent connecté (#167 / #168).
|
||||
static const String parentsCouplesGarde = '/parents/me/couples-garde';
|
||||
static const String parentsCoupleGardeCourant =
|
||||
'/parents/me/couples-garde/courant';
|
||||
static const String assistantesMaternelles = '/assistantes-maternelles';
|
||||
/// Création dossier AM actif par le staff (#156) — body type register AM.
|
||||
static const String assistantesMaternellesDossier =
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:p_tits_pas/models/couple_garde.dart';
|
||||
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||
import 'package:p_tits_pas/services/api/tokenService.dart';
|
||||
|
||||
/// Accès API aux couples de garde du parent connecté — tickets #167 / #168.
|
||||
/// - GET /parents/me/couples-garde
|
||||
/// - PUT /parents/me/couples-garde/courant { couple_id }
|
||||
class CoupleGardeService {
|
||||
static Future<Map<String, String>> _headers() async {
|
||||
final token = await TokenService.getToken();
|
||||
return token != null
|
||||
? ApiConfig.authHeaders(token)
|
||||
: Map<String, String>.from(ApiConfig.headers);
|
||||
}
|
||||
|
||||
static String _extractError(String body, String fallback) {
|
||||
try {
|
||||
final decoded = jsonDecode(body);
|
||||
if (decoded is Map<String, dynamic>) {
|
||||
final message = decoded['message'];
|
||||
if (message is String && message.trim().isNotEmpty) {
|
||||
return message;
|
||||
}
|
||||
if (message is Map && message['message'] is String) {
|
||||
return message['message'] as String;
|
||||
}
|
||||
}
|
||||
} catch (_) {}
|
||||
return fallback;
|
||||
}
|
||||
|
||||
/// Liste les couples de garde et le couple courant du parent connecté.
|
||||
static Future<CouplesGardeResponse> getCouplesGarde() async {
|
||||
final response = await http.get(
|
||||
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.parentsCouplesGarde}'),
|
||||
headers: await _headers(),
|
||||
);
|
||||
|
||||
if (response.statusCode != 200) {
|
||||
throw Exception(
|
||||
_extractError(response.body, 'Erreur chargement des couples de garde'),
|
||||
);
|
||||
}
|
||||
|
||||
final decoded = jsonDecode(response.body);
|
||||
return CouplesGardeResponse.fromJson(
|
||||
Map<String, dynamic>.from(decoded as Map),
|
||||
);
|
||||
}
|
||||
|
||||
/// Persiste le couple courant (préférence utilisateur) et renvoie la liste
|
||||
/// à jour.
|
||||
static Future<CouplesGardeResponse> definirCoupleCourant(
|
||||
String coupleId,
|
||||
) async {
|
||||
final response = await http.put(
|
||||
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.parentsCoupleGardeCourant}'),
|
||||
headers: await _headers(),
|
||||
body: jsonEncode({'couple_id': coupleId}),
|
||||
);
|
||||
|
||||
if (response.statusCode != 200) {
|
||||
throw Exception(
|
||||
_extractError(response.body, 'Erreur sélection du couple de garde'),
|
||||
);
|
||||
}
|
||||
|
||||
final decoded = jsonDecode(response.body);
|
||||
return CouplesGardeResponse.fromJson(
|
||||
Map<String, dynamic>.from(decoded as Map),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,380 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:p_tits_pas/models/couple_garde.dart';
|
||||
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||
import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||
|
||||
/// Rôle qui consulte le bandeau : côté parent (enfant | nounou) ou côté AM
|
||||
/// (enfant | parent(s)). Le composant est le même, seule la lecture change.
|
||||
/// Ticket #167 (parent) ; #170 réutilise en mode AM.
|
||||
enum CoupleBandeauMode { parent, assistanteMaternelle }
|
||||
|
||||
/// Bandeau « couple de garde » en haut de la colonne gauche du TdB.
|
||||
///
|
||||
/// - Plusieurs couples → contrôle unique avec chevron (dropdown de bascule).
|
||||
/// - Un seul couple → affichage informatif (pas de chevron, pas de menu).
|
||||
/// - Aucun couple → état vide discret.
|
||||
class CoupleSelectorBandeau extends StatelessWidget {
|
||||
final CoupleBandeauMode mode;
|
||||
final List<CoupleGarde> couples;
|
||||
final String? selectedCoupleId;
|
||||
final ValueChanged<CoupleGarde>? onCoupleSelected;
|
||||
final bool loading;
|
||||
final String? errorMessage;
|
||||
final VoidCallback? onRetry;
|
||||
|
||||
const CoupleSelectorBandeau({
|
||||
super.key,
|
||||
this.mode = CoupleBandeauMode.parent,
|
||||
required this.couples,
|
||||
this.selectedCoupleId,
|
||||
this.onCoupleSelected,
|
||||
this.loading = false,
|
||||
this.errorMessage,
|
||||
this.onRetry,
|
||||
});
|
||||
|
||||
CoupleGarde? get _selected {
|
||||
if (couples.isEmpty) return null;
|
||||
if (selectedCoupleId != null) {
|
||||
for (final c in couples) {
|
||||
if (c.id == selectedCoupleId) return c;
|
||||
}
|
||||
}
|
||||
for (final c in couples) {
|
||||
if (c.courant) return c;
|
||||
}
|
||||
return couples.first;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return LayoutBuilder(builder: (context, constraints) {
|
||||
if (loading) return const _CoupleBandeauSkeleton();
|
||||
if (errorMessage != null) {
|
||||
return _CoupleBandeauError(message: errorMessage!, onRetry: onRetry);
|
||||
}
|
||||
if (couples.isEmpty) return const _CoupleBandeauEmpty();
|
||||
|
||||
final selected = _selected!;
|
||||
final multi = couples.length > 1;
|
||||
|
||||
final card = _CoupleCard(
|
||||
mode: mode,
|
||||
couple: selected,
|
||||
showChevron: multi,
|
||||
colorIndex: couples.indexOf(selected),
|
||||
);
|
||||
|
||||
if (!multi) return card;
|
||||
|
||||
return Theme(
|
||||
data: Theme.of(context).copyWith(
|
||||
hoverColor: Colors.transparent,
|
||||
splashColor: Colors.transparent,
|
||||
highlightColor: Colors.transparent,
|
||||
focusColor: Colors.transparent,
|
||||
),
|
||||
child: PopupMenuButton<String>(
|
||||
tooltip: 'Changer de garde',
|
||||
// L'offset doit être suffisant pour descendre sous la carte (qui fait 90px).
|
||||
offset: const Offset(0, 95),
|
||||
color: Colors.transparent, // Le fond devient invisible
|
||||
elevation: 0, // Pas d'ombre carrée
|
||||
constraints: BoxConstraints.tightFor(width: constraints.maxWidth),
|
||||
padding: EdgeInsets.zero,
|
||||
onSelected: (id) {
|
||||
final chosen = couples.firstWhere((c) => c.id == id);
|
||||
onCoupleSelected?.call(chosen);
|
||||
},
|
||||
itemBuilder: (context) => [
|
||||
for (final c in couples)
|
||||
if (c.id != selected.id)
|
||||
PopupMenuItem<String>(
|
||||
value: c.id,
|
||||
padding: EdgeInsets.zero,
|
||||
height: 100, // Hauteur de la carte (90) + un peu de marge (10)
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(bottom: 10),
|
||||
child: _CoupleCard(
|
||||
mode: mode,
|
||||
couple: c,
|
||||
showChevron: false,
|
||||
selected: false,
|
||||
isMenuItem: true,
|
||||
colorIndex: couples.indexOf(c),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
child: card,
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// Carte principale : enfant à gauche, séparateur, AM/parents à droite.
|
||||
class _CoupleCard extends StatelessWidget {
|
||||
final CoupleBandeauMode mode;
|
||||
final CoupleGarde couple;
|
||||
final bool showChevron;
|
||||
final bool selected;
|
||||
final bool isMenuItem;
|
||||
final int colorIndex;
|
||||
|
||||
const _CoupleCard({
|
||||
required this.mode,
|
||||
required this.couple,
|
||||
required this.showChevron,
|
||||
this.selected = true,
|
||||
this.isMenuItem = false,
|
||||
required this.colorIndex,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
height: 90,
|
||||
decoration: BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: AssetImage(QuotidienTheme.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length]),
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(right: 12),
|
||||
child: _MembreTile(
|
||||
photoUrl: couple.enfant.photoUrl,
|
||||
name: (couple.enfant.prenom != null && couple.enfant.prenom!.isNotEmpty)
|
||||
? couple.enfant.prenom!
|
||||
: couple.enfant.displayName(fallback: 'Enfant'),
|
||||
fallbackIcon: Icons.child_care,
|
||||
),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
width: 8,
|
||||
height: 44,
|
||||
decoration: const BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: AssetImage(QuotidienTheme.pencilLineVerticalAsset),
|
||||
fit: BoxFit.contain,
|
||||
),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 12),
|
||||
child: _MembreTile(
|
||||
photoUrl: couple.am.photoUrl,
|
||||
name: (couple.am.prenom != null && couple.am.prenom!.isNotEmpty)
|
||||
? couple.am.prenom!
|
||||
: couple.am.displayName(
|
||||
fallback: mode == CoupleBandeauMode.parent
|
||||
? 'Nounou'
|
||||
: 'Parent',
|
||||
),
|
||||
fallbackIcon: mode == CoupleBandeauMode.parent
|
||||
? Icons.volunteer_activism
|
||||
: Icons.person_outline,
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 28,
|
||||
child: showChevron
|
||||
? const Icon(
|
||||
Icons.keyboard_arrow_down,
|
||||
color: QuotidienTheme.ink,
|
||||
)
|
||||
: null,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Photo ronde + nom (une moitié du couple).
|
||||
class _MembreTile extends StatelessWidget {
|
||||
final String? photoUrl;
|
||||
final String name;
|
||||
final IconData fallbackIcon;
|
||||
|
||||
const _MembreTile({
|
||||
required this.photoUrl,
|
||||
required this.name,
|
||||
required this.fallbackIcon,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Row(
|
||||
children: [
|
||||
_Avatar(photoUrl: photoUrl, fallbackIcon: fallbackIcon, size: 64),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Text(
|
||||
name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 22,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Avatar extends StatelessWidget {
|
||||
final String? photoUrl;
|
||||
final IconData fallbackIcon;
|
||||
final double size;
|
||||
|
||||
const _Avatar({
|
||||
required this.photoUrl,
|
||||
required this.fallbackIcon,
|
||||
required this.size,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final url = ApiConfig.absoluteMediaUrl(photoUrl);
|
||||
final placeholder = Container(
|
||||
width: size,
|
||||
height: size,
|
||||
color: QuotidienTheme.lavender.withValues(alpha: 0.35),
|
||||
child: Icon(fallbackIcon, size: size * 0.5, color: QuotidienTheme.ink),
|
||||
);
|
||||
return ClipOval(
|
||||
child: SizedBox(
|
||||
width: size,
|
||||
height: size,
|
||||
child: url.isEmpty
|
||||
? placeholder
|
||||
: AuthNetworkImage(
|
||||
url: url,
|
||||
width: size,
|
||||
height: size,
|
||||
fit: BoxFit.cover,
|
||||
errorBuilder: (_, __, ___) => placeholder,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _CoupleBandeauSkeleton extends StatelessWidget {
|
||||
const _CoupleBandeauSkeleton();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
height: 90,
|
||||
decoration: BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
|
||||
fit: BoxFit.fill,
|
||||
colorFilter: ColorFilter.mode(
|
||||
Colors.white.withValues(alpha: 0.5),
|
||||
BlendMode.lighten,
|
||||
),
|
||||
),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: const SizedBox(
|
||||
width: 26,
|
||||
height: 26,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _CoupleBandeauEmpty extends StatelessWidget {
|
||||
const _CoupleBandeauEmpty();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
height: 90,
|
||||
decoration: const BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: AssetImage(QuotidienTheme.bandeauLime), // Un asset existant par défaut
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.info_outline, color: QuotidienTheme.muted),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Text(
|
||||
'Aucune garde active pour le moment.',
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 14,
|
||||
color: QuotidienTheme.muted,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _CoupleBandeauError extends StatelessWidget {
|
||||
final String message;
|
||||
final VoidCallback? onRetry;
|
||||
|
||||
const _CoupleBandeauError({required this.message, this.onRetry});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
height: 90,
|
||||
decoration: BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
|
||||
fit: BoxFit.fill,
|
||||
colorFilter: ColorFilter.mode(
|
||||
QuotidienTheme.coral.withValues(alpha: 0.3),
|
||||
BlendMode.srcATop,
|
||||
),
|
||||
),
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.error_outline, color: QuotidienTheme.ink),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Text(
|
||||
message,
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 13,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (onRetry != null)
|
||||
TextButton(
|
||||
onPressed: onRetry,
|
||||
child: const Text('Réessayer'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,29 @@ abstract final class QuotidienTheme {
|
||||
/// couleur charte par section ; l'inactive est la même, plus transparente.
|
||||
static const double pillInactiveOpacity = 0.45;
|
||||
static const String pillIvoryAsset = 'assets/images/bg_ivoire_pill.png';
|
||||
static const String pillBlueAsset = 'assets/images/bg_blue_pill.png';
|
||||
|
||||
// Bandeaux pour les couples (ratio 10:1, dessinés au crayon, couleur dynamique)
|
||||
static const String bandeauLime = 'assets/images/bandeau_lime.png';
|
||||
static const String bandeauBlue = 'assets/images/bandeau_blue.png';
|
||||
static const String bandeauPeach = 'assets/images/bandeau_peach.png';
|
||||
static const String bandeauYellow = 'assets/images/bandeau_yellow.png';
|
||||
static const String bandeauLavender = 'assets/images/bandeau_lavender.png';
|
||||
|
||||
static const List<String> bandeauColors = [
|
||||
bandeauLime,
|
||||
bandeauBlue,
|
||||
bandeauPeach,
|
||||
bandeauYellow,
|
||||
bandeauLavender,
|
||||
];
|
||||
|
||||
/// Retourne un asset bandeau fixe pour un couple donné (basé sur son ID)
|
||||
static String bandeauAssetForCouple(String coupleId) {
|
||||
if (coupleId.isEmpty) return bandeauLime;
|
||||
final hash = coupleId.hashCode.abs();
|
||||
return bandeauColors[hash % bandeauColors.length];
|
||||
}
|
||||
static const String pillYellowAsset = 'assets/images/bg_yellow_pill.png';
|
||||
static const String pillPeachAsset = 'assets/images/bg_peach_pill.png';
|
||||
static const String pillTurquoiseAsset =
|
||||
|
||||
Reference in New Issue
Block a user