Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7783badca | ||
|
|
6a586110e7 | ||
|
|
f9fd8d73a8 | ||
|
|
93ee3a5549 | ||
|
|
db08aca714 | ||
|
|
494f0e4c19 | ||
|
|
9a4664a8ea | ||
|
|
bf00933f65 | ||
|
|
7b4650b81b | ||
|
|
b7ae07f5aa | ||
|
|
a88f791317 | ||
|
|
138398a4a0 | ||
|
|
7cf30643aa | ||
|
|
5eb3468fe0 | ||
|
|
df4f48e864 | ||
|
|
6f9136aae5 |
@@ -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 { Users } from './users.entity';
|
||||||
import { ParentsChildren } from './parents_children.entity';
|
import { ParentsChildren } from './parents_children.entity';
|
||||||
import { Dossier } from './dossiers.entity';
|
import { Dossier } from './dossiers.entity';
|
||||||
|
import { AmChildren } from './am_children.entity';
|
||||||
|
|
||||||
@Entity('parents', { schema: 'public' })
|
@Entity('parents', { schema: 'public' })
|
||||||
export class Parents {
|
export class Parents {
|
||||||
@@ -25,6 +26,17 @@ export class Parents {
|
|||||||
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
||||||
numero_dossier?: string;
|
numero_dossier?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Placement AM↔enfant sélectionné sur le TdB parent (couple actif) — ticket #168.
|
||||||
|
* Null / absent = le front prend le premier couple actif retourné par l’API.
|
||||||
|
*/
|
||||||
|
@Column({ name: 'id_placement_garde_courant', type: 'uuid', nullable: true })
|
||||||
|
id_placement_garde_courant?: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AmChildren, { nullable: true, onDelete: 'SET NULL' })
|
||||||
|
@JoinColumn({ name: 'id_placement_garde_courant', referencedColumnName: 'id' })
|
||||||
|
placement_garde_courant?: AmChildren;
|
||||||
|
|
||||||
// Lien vers enfants via la table enfants_parents
|
// Lien vers enfants via la table enfants_parents
|
||||||
@OneToMany(() => ParentsChildren, pc => pc.parent)
|
@OneToMany(() => ParentsChildren, pc => pc.parent)
|
||||||
parentChildren: ParentsChildren[];
|
parentChildren: ParentsChildren[];
|
||||||
|
|||||||
@@ -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(),
|
createParentDossierStaff: jest.fn(),
|
||||||
addCoParentStaff: jest.fn(),
|
addCoParentStaff: jest.fn(),
|
||||||
};
|
};
|
||||||
const parentsServiceMock = {};
|
const parentsServiceMock = {
|
||||||
|
listerCouplesGarde: jest.fn(),
|
||||||
|
definirCoupleGardeCourant: jest.fn(),
|
||||||
|
};
|
||||||
const userServiceMock = {};
|
const userServiceMock = {};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
@@ -39,6 +42,31 @@ describe('ParentsController', () => {
|
|||||||
expect(controller).toBeDefined();
|
expect(controller).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('listerCouplesGarde délègue au service (#168)', async () => {
|
||||||
|
parentsServiceMock.listerCouplesGarde.mockResolvedValue({
|
||||||
|
couples: [],
|
||||||
|
couple_courant_id: null,
|
||||||
|
});
|
||||||
|
const res = await controller.listerCouplesGarde('parent-uuid');
|
||||||
|
expect(parentsServiceMock.listerCouplesGarde).toHaveBeenCalledWith('parent-uuid');
|
||||||
|
expect(res.couples).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('definirCoupleGardeCourant délègue au service (#168)', async () => {
|
||||||
|
parentsServiceMock.definirCoupleGardeCourant.mockResolvedValue({
|
||||||
|
couples: [{ id: 'pl-1', courant: true }],
|
||||||
|
couple_courant_id: 'pl-1',
|
||||||
|
});
|
||||||
|
const res = await controller.definirCoupleGardeCourant('parent-uuid', {
|
||||||
|
couple_id: 'pl-1',
|
||||||
|
});
|
||||||
|
expect(parentsServiceMock.definirCoupleGardeCourant).toHaveBeenCalledWith(
|
||||||
|
'parent-uuid',
|
||||||
|
'pl-1',
|
||||||
|
);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-1');
|
||||||
|
});
|
||||||
|
|
||||||
it('createDossier delegates to authService.createParentDossierStaff with CGU accepted', async () => {
|
it('createDossier delegates to authService.createParentDossierStaff with CGU accepted', async () => {
|
||||||
authServiceMock.createParentDossierStaff.mockResolvedValue({
|
authServiceMock.createParentDossierStaff.mockResolvedValue({
|
||||||
message: 'Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.',
|
message: 'Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.',
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
Param,
|
Param,
|
||||||
Patch,
|
Patch,
|
||||||
Post,
|
Post,
|
||||||
|
Put,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ParentsService } from './parents.service';
|
import { ParentsService } from './parents.service';
|
||||||
@@ -39,6 +40,8 @@ import { User } from 'src/common/decorators/user.decorator';
|
|||||||
import { PendingFamilyDto } from './dto/pending-family.dto';
|
import { PendingFamilyDto } from './dto/pending-family.dto';
|
||||||
import { DossierFamilleCompletDto } from './dto/dossier-famille-complet.dto';
|
import { DossierFamilleCompletDto } from './dto/dossier-famille-complet.dto';
|
||||||
import { mapParentForApi, mapParentsForApi } from './parents.mapper';
|
import { mapParentForApi, mapParentsForApi } from './parents.mapper';
|
||||||
|
import { CouplesGardeResponseDto } from './dto/couples-garde.dto';
|
||||||
|
import { DefinirCoupleGardeCourantDto } from './dto/definir-couple-garde-courant.dto';
|
||||||
|
|
||||||
@ApiTags('Parents')
|
@ApiTags('Parents')
|
||||||
@ApiBearerAuth('access-token')
|
@ApiBearerAuth('access-token')
|
||||||
@@ -51,6 +54,39 @@ export class ParentsController {
|
|||||||
private readonly authService: AuthService,
|
private readonly authService: AuthService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
@Get('me/couples-garde')
|
||||||
|
@Roles(RoleType.PARENT)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Lister les couples de garde du parent connecté — ticket #168',
|
||||||
|
description:
|
||||||
|
'Retourne les placements actifs enfant↔AM rattachés au parent, ' +
|
||||||
|
'avec indication du couple courant (bandeau TdB quotidien).',
|
||||||
|
})
|
||||||
|
@ApiResponse({ status: 200, type: CouplesGardeResponseDto })
|
||||||
|
@ApiResponse({ status: 403, description: 'Réservé au rôle parent' })
|
||||||
|
@ApiResponse({ status: 404, description: 'Parent introuvable' })
|
||||||
|
listerCouplesGarde(@User('id') userId: string): Promise<CouplesGardeResponseDto> {
|
||||||
|
return this.parentsService.listerCouplesGarde(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put('me/couples-garde/courant')
|
||||||
|
@Roles(RoleType.PARENT)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Définir le couple de garde courant — ticket #168',
|
||||||
|
description:
|
||||||
|
'Persiste la préférence de couple actif (enfant|nounou) pour contextualiser le TdB.',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: DefinirCoupleGardeCourantDto })
|
||||||
|
@ApiResponse({ status: 200, type: CouplesGardeResponseDto })
|
||||||
|
@ApiResponse({ status: 400, description: 'Couple hors périmètre du parent' })
|
||||||
|
@ApiResponse({ status: 404, description: 'Parent ou couple introuvable' })
|
||||||
|
definirCoupleGardeCourant(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@Body() dto: DefinirCoupleGardeCourantDto,
|
||||||
|
): Promise<CouplesGardeResponseDto> {
|
||||||
|
return this.parentsService.definirCoupleGardeCourant(userId, dto.couple_id);
|
||||||
|
}
|
||||||
|
|
||||||
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR, RoleType.GESTIONNAIRE)
|
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR, RoleType.GESTIONNAIRE)
|
||||||
@Post('dossier')
|
@Post('dossier')
|
||||||
@HttpCode(HttpStatus.CREATED)
|
@HttpCode(HttpStatus.CREATED)
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { JwtModule } from '@nestjs/jwt';
|
|||||||
import { Parents } from 'src/entities/parents.entity';
|
import { Parents } from 'src/entities/parents.entity';
|
||||||
import { DossierFamille, DossierFamilleEnfant } from 'src/entities/dossier_famille.entity';
|
import { DossierFamille, DossierFamilleEnfant } from 'src/entities/dossier_famille.entity';
|
||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { ParentsController } from './parents.controller';
|
import { ParentsController } from './parents.controller';
|
||||||
import { ParentsService } from './parents.service';
|
import { ParentsService } from './parents.service';
|
||||||
import { Users } from 'src/entities/users.entity';
|
import { Users } from 'src/entities/users.entity';
|
||||||
@@ -13,7 +14,14 @@ import { AuthModule } from '../auth/auth.module';
|
|||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TypeOrmModule.forFeature([Parents, Users, DossierFamille, DossierFamilleEnfant, ParentsChildren]),
|
TypeOrmModule.forFeature([
|
||||||
|
Parents,
|
||||||
|
Users,
|
||||||
|
DossierFamille,
|
||||||
|
DossierFamilleEnfant,
|
||||||
|
ParentsChildren,
|
||||||
|
AmChildren,
|
||||||
|
]),
|
||||||
forwardRef(() => UserModule),
|
forwardRef(() => UserModule),
|
||||||
forwardRef(() => AuthModule),
|
forwardRef(() => AuthModule),
|
||||||
JwtModule.registerAsync({
|
JwtModule.registerAsync({
|
||||||
|
|||||||
@@ -1,12 +1,43 @@
|
|||||||
|
import { BadRequestException, NotFoundException } from '@nestjs/common';
|
||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
import { ParentsService } from './parents.service';
|
import { ParentsService } from './parents.service';
|
||||||
|
import { Parents } from 'src/entities/parents.entity';
|
||||||
|
import { Users } from 'src/entities/users.entity';
|
||||||
|
import { DossierFamille } from 'src/entities/dossier_famille.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
|
||||||
describe('ParentsService', () => {
|
describe('ParentsService — couples de garde (#168)', () => {
|
||||||
let service: ParentsService;
|
let service: ParentsService;
|
||||||
|
|
||||||
|
const parentsRepository = {
|
||||||
|
findOne: jest.fn(),
|
||||||
|
update: jest.fn(),
|
||||||
|
};
|
||||||
|
const parentsChildrenRepository = {
|
||||||
|
find: jest.fn(),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
};
|
||||||
|
const amChildrenRepository = {
|
||||||
|
find: jest.fn(),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
|
jest.clearAllMocks();
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
providers: [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();
|
}).compile();
|
||||||
|
|
||||||
service = module.get<ParentsService>(ParentsService);
|
service = module.get<ParentsService>(ParentsService);
|
||||||
@@ -15,4 +46,107 @@ describe('ParentsService', () => {
|
|||||||
it('should be defined', () => {
|
it('should be defined', () => {
|
||||||
expect(service).toBeDefined();
|
expect(service).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('listerCouplesGarde', () => {
|
||||||
|
it('retourne une liste vide si le parent n’a pas d’enfant', async () => {
|
||||||
|
parentsRepository.findOne.mockResolvedValue({
|
||||||
|
user_id: 'p1',
|
||||||
|
id_placement_garde_courant: null,
|
||||||
|
});
|
||||||
|
parentsChildrenRepository.find.mockResolvedValue([]);
|
||||||
|
|
||||||
|
const res = await service.listerCouplesGarde('p1');
|
||||||
|
expect(res).toEqual({ couples: [], couple_courant_id: null });
|
||||||
|
expect(amChildrenRepository.find).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('mappe les placements actifs en couples et marque le courant', async () => {
|
||||||
|
parentsRepository.findOne.mockResolvedValue({
|
||||||
|
user_id: 'p1',
|
||||||
|
id_placement_garde_courant: 'pl-2',
|
||||||
|
});
|
||||||
|
parentsChildrenRepository.find.mockResolvedValue([
|
||||||
|
{ enfantId: 'e1' },
|
||||||
|
{ enfantId: 'e2' },
|
||||||
|
]);
|
||||||
|
amChildrenRepository.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
child: { id: 'e1', first_name: 'Léo', last_name: 'M', photo_url: null },
|
||||||
|
am: { user: { prenom: 'Marie', nom: 'N', photo_url: '/a.jpg' } },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'pl-2',
|
||||||
|
amId: 'am-2',
|
||||||
|
child: { id: 'e2', first_name: 'Léa', last_name: 'M', photo_url: null },
|
||||||
|
am: { user: { prenom: 'Sophie', nom: 'P', photo_url: null } },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const res = await service.listerCouplesGarde('p1');
|
||||||
|
expect(res.couples).toHaveLength(2);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-2');
|
||||||
|
expect(res.couples[1].courant).toBe(true);
|
||||||
|
expect(res.couples[0].am.prenom).toBe('Marie');
|
||||||
|
expect(res.couples[0].enfant.prenom).toBe('Léo');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('404 si parent inconnu', async () => {
|
||||||
|
parentsRepository.findOne.mockResolvedValue(null);
|
||||||
|
await expect(service.listerCouplesGarde('x')).rejects.toBeInstanceOf(
|
||||||
|
NotFoundException,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('definirCoupleGardeCourant', () => {
|
||||||
|
it('persiste le couple si l’enfant est rattaché au parent', async () => {
|
||||||
|
parentsRepository.findOne.mockResolvedValue({
|
||||||
|
user_id: 'p1',
|
||||||
|
id_placement_garde_courant: null,
|
||||||
|
});
|
||||||
|
amChildrenRepository.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
parentsChildrenRepository.findOne.mockResolvedValue({
|
||||||
|
parentId: 'p1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
});
|
||||||
|
parentsRepository.update.mockResolvedValue({ affected: 1 });
|
||||||
|
// second call via listerCouplesGarde
|
||||||
|
parentsChildrenRepository.find.mockResolvedValue([{ enfantId: 'e1' }]);
|
||||||
|
amChildrenRepository.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
child: { id: 'e1', first_name: 'Léo', last_name: null, photo_url: null },
|
||||||
|
am: { user: { prenom: 'Marie', nom: null, photo_url: null } },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const res = await service.definirCoupleGardeCourant('p1', 'pl-1');
|
||||||
|
expect(parentsRepository.update).toHaveBeenCalledWith(
|
||||||
|
{ user_id: 'p1' },
|
||||||
|
{ id_placement_garde_courant: 'pl-1' },
|
||||||
|
);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-1');
|
||||||
|
expect(res.couples[0].courant).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('400 si le couple n’appartient pas au parent', async () => {
|
||||||
|
parentsRepository.findOne.mockResolvedValue({ user_id: 'p1' });
|
||||||
|
amChildrenRepository.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
enfantId: 'e99',
|
||||||
|
});
|
||||||
|
parentsChildrenRepository.findOne.mockResolvedValue(null);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.definirCoupleGardeCourant('p1', 'pl-1'),
|
||||||
|
).rejects.toBeInstanceOf(BadRequestException);
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { In, Repository } from 'typeorm';
|
import { In, IsNull, Repository } from 'typeorm';
|
||||||
import { Parents } from 'src/entities/parents.entity';
|
import { Parents } from 'src/entities/parents.entity';
|
||||||
import { DossierFamille } from 'src/entities/dossier_famille.entity';
|
import { DossierFamille } from 'src/entities/dossier_famille.entity';
|
||||||
import { RoleType, Users } from 'src/entities/users.entity';
|
import { RoleType, Users } from 'src/entities/users.entity';
|
||||||
@@ -20,6 +20,8 @@ import {
|
|||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { Children } from 'src/entities/children.entity';
|
import { Children } from 'src/entities/children.entity';
|
||||||
import { UpdateParentFicheAdminDto } from './dto/update-parent-fiche-admin.dto';
|
import { UpdateParentFicheAdminDto } from './dto/update-parent-fiche-admin.dto';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { CouplesGardeResponseDto } from './dto/couples-garde.dto';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ParentsService {
|
export class ParentsService {
|
||||||
@@ -32,6 +34,8 @@ export class ParentsService {
|
|||||||
private readonly dossierFamilleRepository: Repository<DossierFamille>,
|
private readonly dossierFamilleRepository: Repository<DossierFamille>,
|
||||||
@InjectRepository(ParentsChildren)
|
@InjectRepository(ParentsChildren)
|
||||||
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
||||||
|
@InjectRepository(AmChildren)
|
||||||
|
private readonly amChildrenRepository: Repository<AmChildren>,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
// Création d’un parent
|
// Création d’un parent
|
||||||
@@ -505,4 +509,108 @@ export class ParentsService {
|
|||||||
}
|
}
|
||||||
return raw.map((r: { id: string }) => r.id);
|
return raw.map((r: { id: string }) => r.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liste les couples de garde (enfant ↔ AM) du parent connecté — ticket #168.
|
||||||
|
* Un couple = un placement actif dans enfants_assistantes_maternelles pour un enfant du parent.
|
||||||
|
*/
|
||||||
|
async listerCouplesGarde(parentUserId: string): Promise<CouplesGardeResponseDto> {
|
||||||
|
const parent = await this.parentsRepository.findOne({
|
||||||
|
where: { user_id: parentUserId },
|
||||||
|
});
|
||||||
|
if (!parent) {
|
||||||
|
throw new NotFoundException('Parent introuvable');
|
||||||
|
}
|
||||||
|
|
||||||
|
const liensEnfants = await this.parentsChildrenRepository.find({
|
||||||
|
where: { parentId: parentUserId },
|
||||||
|
select: ['enfantId'],
|
||||||
|
});
|
||||||
|
const enfantIds = liensEnfants.map((l) => l.enfantId);
|
||||||
|
if (enfantIds.length === 0) {
|
||||||
|
return { couples: [], couple_courant_id: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
const placements = await this.amChildrenRepository.find({
|
||||||
|
where: { enfantId: In(enfantIds), date_fin: IsNull() },
|
||||||
|
relations: ['child', 'am', 'am.user'],
|
||||||
|
order: { date_debut: 'ASC' },
|
||||||
|
});
|
||||||
|
|
||||||
|
let idCourant = parent.id_placement_garde_courant ?? null;
|
||||||
|
const idsValides = new Set(placements.map((p) => p.id));
|
||||||
|
if (idCourant && !idsValides.has(idCourant)) {
|
||||||
|
idCourant = null;
|
||||||
|
await this.parentsRepository.update(
|
||||||
|
{ user_id: parentUserId },
|
||||||
|
{ id_placement_garde_courant: () => 'NULL' },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!idCourant && placements.length === 1) {
|
||||||
|
idCourant = placements[0].id;
|
||||||
|
}
|
||||||
|
|
||||||
|
const couples = placements.map((p) => {
|
||||||
|
const amUser = p.am?.user;
|
||||||
|
return {
|
||||||
|
id: p.id,
|
||||||
|
enfant: {
|
||||||
|
id: p.child.id,
|
||||||
|
prenom: p.child.first_name ?? null,
|
||||||
|
nom: p.child.last_name ?? null,
|
||||||
|
photo_url: p.child.photo_url ?? null,
|
||||||
|
},
|
||||||
|
am: {
|
||||||
|
id: p.amId,
|
||||||
|
prenom: amUser?.prenom ?? null,
|
||||||
|
nom: amUser?.nom ?? null,
|
||||||
|
photo_url: amUser?.photo_url ?? null,
|
||||||
|
},
|
||||||
|
courant: idCourant != null && p.id === idCourant,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
couples,
|
||||||
|
couple_courant_id: idCourant,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persiste le couple de garde actif pour le parent — ticket #168.
|
||||||
|
*/
|
||||||
|
async definirCoupleGardeCourant(
|
||||||
|
parentUserId: string,
|
||||||
|
coupleId: string,
|
||||||
|
): Promise<CouplesGardeResponseDto> {
|
||||||
|
const parent = await this.parentsRepository.findOne({
|
||||||
|
where: { user_id: parentUserId },
|
||||||
|
});
|
||||||
|
if (!parent) {
|
||||||
|
throw new NotFoundException('Parent introuvable');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placement = await this.amChildrenRepository.findOne({
|
||||||
|
where: { id: coupleId, date_fin: IsNull() },
|
||||||
|
});
|
||||||
|
if (!placement) {
|
||||||
|
throw new NotFoundException('Couple de garde introuvable ou inactif');
|
||||||
|
}
|
||||||
|
|
||||||
|
const lien = await this.parentsChildrenRepository.findOne({
|
||||||
|
where: { parentId: parentUserId, enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
if (!lien) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'Ce couple ne concerne pas un enfant rattaché à ce parent',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.parentsRepository.update(
|
||||||
|
{ user_id: parentUserId },
|
||||||
|
{ id_placement_garde_courant: coupleId },
|
||||||
|
);
|
||||||
|
|
||||||
|
return this.listerCouplesGarde(parentUserId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+45
-21
@@ -35,13 +35,15 @@ DO $$ BEGIN
|
|||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_avenant_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_avenant_type') THEN
|
||||||
CREATE TYPE statut_avenant_type AS ENUM ('propose', 'accepte', 'refuse');
|
CREATE TYPE statut_avenant_type AS ENUM ('propose', 'accepte', 'refuse');
|
||||||
END IF;
|
END IF;
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type') THEN
|
||||||
CREATE TYPE type_evenement_type AS ENUM (
|
CREATE TYPE type_absence_garde_type AS ENUM (
|
||||||
'absence_enfant', 'conge_am', 'conge_parent', 'arret_maladie_am', 'evenement_rpe'
|
'absence_enfant', 'conge_am', 'arret_maladie_am'
|
||||||
);
|
);
|
||||||
END IF;
|
END IF;
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type') THEN
|
||||||
CREATE TYPE statut_evenement_type AS ENUM ('propose', 'valide', 'refuse');
|
CREATE TYPE statut_absence_garde_type AS ENUM (
|
||||||
|
'en_attente', 'accepte', 'refuse'
|
||||||
|
);
|
||||||
END IF;
|
END IF;
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_validation_type') THEN
|
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');
|
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 (
|
CREATE TABLE parents (
|
||||||
id_utilisateur UUID PRIMARY KEY REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
id_utilisateur UUID PRIMARY KEY REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
||||||
id_co_parent UUID REFERENCES utilisateurs(id),
|
id_co_parent UUID REFERENCES utilisateurs(id),
|
||||||
numero_dossier VARCHAR(20)
|
numero_dossier VARCHAR(20),
|
||||||
|
-- Préférence couple de garde actif (TdB quotidien) — ticket #168
|
||||||
|
-- FK ajoutée après création de enfants_assistantes_maternelles (voir ALTER plus bas)
|
||||||
|
id_placement_garde_courant UUID
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE INDEX idx_parents_numero_dossier
|
CREATE INDEX idx_parents_numero_dossier
|
||||||
@@ -206,6 +211,16 @@ CREATE UNIQUE INDEX uq_enfant_garde_active
|
|||||||
ON enfants_assistantes_maternelles (id_enfant)
|
ON enfants_assistantes_maternelles (id_enfant)
|
||||||
WHERE date_fin IS NULL;
|
WHERE date_fin IS NULL;
|
||||||
|
|
||||||
|
-- FK couple courant parent → placement (#168) — après table enfants_assistantes_maternelles
|
||||||
|
ALTER TABLE parents
|
||||||
|
ADD CONSTRAINT fk_parents_placement_garde_courant
|
||||||
|
FOREIGN KEY (id_placement_garde_courant)
|
||||||
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
CREATE INDEX idx_parents_placement_garde_courant
|
||||||
|
ON parents(id_placement_garde_courant)
|
||||||
|
WHERE id_placement_garde_courant IS NOT NULL;
|
||||||
|
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
-- Table : dossier_famille (inscription parent — ticket #119)
|
-- Table : dossier_famille (inscription parent — ticket #119)
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
@@ -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(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
type type_evenement_type,
|
id_placement UUID NOT NULL
|
||||||
id_enfant UUID REFERENCES enfants(id) ON DELETE CASCADE,
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||||
id_am UUID REFERENCES utilisateurs(id),
|
type type_absence_garde_type NOT NULL,
|
||||||
id_parent UUID REFERENCES parents(id_utilisateur),
|
date_debut DATE NOT NULL,
|
||||||
cree_par UUID REFERENCES utilisateurs(id),
|
date_fin DATE NOT NULL,
|
||||||
date_debut TIMESTAMPTZ,
|
statut statut_absence_garde_type NOT NULL DEFAULT 'en_attente',
|
||||||
date_fin TIMESTAMPTZ,
|
expire_at TIMESTAMPTZ NOT NULL,
|
||||||
commentaires TEXT,
|
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||||
statut statut_evenement_type DEFAULT 'propose',
|
id_card_instance UUID,
|
||||||
delai_grace TIMESTAMPTZ,
|
motif TEXT,
|
||||||
urgent BOOLEAN DEFAULT false,
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
cree_le TIMESTAMPTZ DEFAULT now(),
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
modifie_le TIMESTAMPTZ 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
|
-- 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** :
|
**Valeurs autorisées** :
|
||||||
|
|
||||||
| Valeur | Description |
|
| Valeur | Description |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `absence_enfant` | Enfant absent |
|
| `absence_enfant` | Absence déclarée par un parent |
|
||||||
| `conge_am` | Congé de l’assistante maternelle |
|
| `conge_am` | Congé de l’assistante maternelle |
|
||||||
| `conge_parent` | Congé du parent |
|
|
||||||
| `arret_maladie_am` | Arrêt maladie AM |
|
| `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** :
|
**Valeurs autorisées** :
|
||||||
|
|
||||||
| Valeur | Description |
|
| Valeur | Description |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `propose` | Événement proposé |
|
| `en_attente` | En attente de validation / ack |
|
||||||
| `valide` | Événement validé |
|
| `accepte` | Accepté / acté (conservé en historique métier) |
|
||||||
| `rejete` | Événement refusé |
|
| `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é |
|
| **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(id_contrat)** → `contrats(id)` | **CASCADE** | Avenants détruits avec le contrat |
|
||||||
| **avenants_contrats(initie_par)** → `utilisateurs(id)` | **SET NULL** | Historiser l’avenant sans bloquer |
|
| **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 |
|
| **absences_garde(id_placement)** → `enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus d’absences |
|
||||||
| **evenements(id_am)** → `utilisateurs(id)` | **SET NULL** | Garder la trace même si AM supprimée |
|
| **absences_garde(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver la période si user supprimé |
|
||||||
| **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 |
|
|
||||||
| **signalements_bugs(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Conserver le ticket même si compte 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 |
|
| **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 |
|
| **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**
|
- `avenants_contrats.initie_par` → **SET NULL**
|
||||||
|
|
||||||
### Événements
|
### Événements
|
||||||
- `evenements.id_enfant` → **CASCADE**
|
- `absences_garde.id_placement` → **CASCADE**
|
||||||
- `evenements.id_am` → **SET NULL**
|
- `absences_garde.cree_par` → **SET NULL**
|
||||||
- `evenements.id_parent` → **SET NULL**
|
|
||||||
- `evenements.cree_par` → **SET NULL**
|
|
||||||
|
|
||||||
### Divers
|
### Divers
|
||||||
- `signalements_bugs.id_utilisateur` → **SET NULL**
|
- `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**
|
4. **Suppression d’un enfant**
|
||||||
- Supprimer `enfants(id=childA)`
|
- 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**
|
5. **Suppression d’un utilisateur AM**
|
||||||
- Supprimer `utilisateurs(id=amB)`
|
- 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;
|
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)
|
-- 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
|
GROUP BY c.id, c.id_dossier, c.statut
|
||||||
ORDER BY c.cree_le DESC;
|
ORDER BY c.cree_le DESC;
|
||||||
|
|
||||||
\echo '=== 9) Evénements par enfant (30 derniers jours) =============='
|
\echo '=== 9) Absences_garde (30 derniers jours) ====================='
|
||||||
SELECT ev.id, ev.type, ev.id_enfant, e.prenom AS enfant, ev.date_debut, ev.date_fin, ev.statut
|
SELECT ag.id, ag.type, ag.id_placement, ag.date_debut, ag.date_fin, ag.statut, ag.expire_at
|
||||||
FROM evenements ev
|
FROM absences_garde ag
|
||||||
JOIN enfants e ON e.id = ev.id_enfant
|
WHERE ag.date_debut >= (NOW()::date - INTERVAL '30 days')
|
||||||
WHERE ev.date_debut >= (NOW()::date - INTERVAL '30 days')
|
ORDER BY ag.date_debut DESC;
|
||||||
ORDER BY ev.date_debut DESC;
|
|
||||||
|
|
||||||
\echo '=== 10) Uploads & notifications récentes ======================='
|
\echo '=== 10) Uploads & notifications récentes ======================='
|
||||||
SELECT u.courriel, up.fichier_url, up.type_fichier, up.cree_le
|
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
|
LEFT JOIN contrats c ON c.id = a.id_contrat
|
||||||
WHERE c.id IS NULL;
|
WHERE c.id IS NULL;
|
||||||
|
|
||||||
-- Evénements sans enfant
|
-- Absences sans placement
|
||||||
SELECT ev.*
|
SELECT ag.*
|
||||||
FROM evenements ev
|
FROM absences_garde ag
|
||||||
LEFT JOIN enfants e ON e.id = ev.id_enfant
|
LEFT JOIN enfants_assistantes_maternelles eam ON eam.id = ag.id_placement
|
||||||
WHERE e.id IS NULL;
|
WHERE eam.id IS NULL;
|
||||||
|
|
||||||
\echo '=== 13) Performance : EXPLAIN sur requêtes clés ==============='
|
\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
|
ORDER BY m.cree_le DESC
|
||||||
LIMIT 20;
|
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
|
EXPLAIN ANALYZE
|
||||||
SELECT ev.*
|
SELECT ag.*
|
||||||
FROM evenements ev
|
FROM absences_garde ag
|
||||||
WHERE ev.id_enfant = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
|
WHERE ag.id_placement IS NOT NULL
|
||||||
AND ev.date_debut >= '2025-01-01';
|
AND ag.date_debut >= '2025-01-01';
|
||||||
|
|
||||||
-- Notifications non lues (idx_notifications_user_lu_cree_le)
|
-- Notifications non lues (idx_notifications_user_lu_cree_le)
|
||||||
EXPLAIN ANALYZE
|
EXPLAIN ANALYZE
|
||||||
@@ -199,7 +198,7 @@ SELECT
|
|||||||
(SELECT COUNT(*) FROM messages) AS nb_messages,
|
(SELECT COUNT(*) FROM messages) AS nb_messages,
|
||||||
(SELECT COUNT(*) FROM contrats) AS nb_contrats,
|
(SELECT COUNT(*) FROM contrats) AS nb_contrats,
|
||||||
(SELECT COUNT(*) FROM avenants_contrats) AS nb_avenants,
|
(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 uploads) AS nb_uploads,
|
||||||
(SELECT COUNT(*) FROM notifications) AS nb_notifications,
|
(SELECT COUNT(*) FROM notifications) AS nb_notifications,
|
||||||
(SELECT COUNT(*) FROM validations) AS nb_validations;
|
(SELECT COUNT(*) FROM validations) AS nb_validations;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# 📋 Décisions Projet - P'titsPas
|
# 📋 Décisions Projet - P'titsPas
|
||||||
|
|
||||||
**Version** : 1.2
|
**Version** : 1.3
|
||||||
**Date** : 16 Juin 2026
|
**Date** : 24 Septembre 2026
|
||||||
**Auteur** : Équipe PtitsPas
|
**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** :
|
**Justification** :
|
||||||
- Simplicité (petite équipe)
|
- Simplicité (petite équipe)
|
||||||
- Flexibilité
|
- Historique lisible sur `develop` / `master` (1 commit = 1 ticket)
|
||||||
|
- Déploiement prod uniquement depuis `master`
|
||||||
|
|
||||||
**Branches** :
|
**Branches** :
|
||||||
- `master` : Production
|
- `master` : Production (déploiement auto)
|
||||||
- `archive/*` : Archives (ex: maquette initiale)
|
- `develop` : Intégration / recette
|
||||||
- `migration/*` : Migrations (ex: intégration YNOV)
|
- `feature/*` : Ticket en cours (depuis `develop`)
|
||||||
- `feature/*` : Nouvelles fonctionnalités
|
- `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"}
|
||||||
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -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 .
|
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls?state=open" | jq .
|
||||||
|
|
||||||
# Créer une PR (head = branche source, base = branche cible)
|
# Créer une PR (head = branche source, base = branche cible)
|
||||||
|
# Norme : feature/* → develop, puis develop → master
|
||||||
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
|
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d '{"head":"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"
|
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
|
||||||
|
|
||||||
|
# Merger en squash (norme — voir 24_DECISIONS-PROJET.md §26)
|
||||||
|
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"Do":"squash","MergeTitleField":"feat(#XX): Titre","MergeMessageField":"Closes #XX"}' \
|
||||||
|
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls/{index}/merge"
|
||||||
```
|
```
|
||||||
|
|
||||||
### 3.4 Branches
|
### 3.4 Branches
|
||||||
|
|||||||
@@ -194,6 +194,9 @@ frontend/lib/
|
|||||||
|
|
||||||
## Workflow Git
|
## Workflow Git
|
||||||
|
|
||||||
|
Norme projet : **squash merge** (voir [24_DECISIONS-PROJET.md](./24_DECISIONS-PROJET.md) §26).
|
||||||
|
Cible habituelle : `feature/*` → `develop` ; puis `develop` → `master` quand le lot est prêt.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 1. Créer une branche feature
|
# 1. Créer une branche feature
|
||||||
git checkout develop
|
git checkout develop
|
||||||
@@ -204,15 +207,22 @@ git checkout -b feature/XX-nom-ticket
|
|||||||
git add .
|
git add .
|
||||||
git commit -m "feat(#XX): Description courte"
|
git commit -m "feat(#XX): Description courte"
|
||||||
|
|
||||||
# 3. Pousser et créer PR
|
# 3. Pousser et créer PR vers develop
|
||||||
git push -u origin feature/XX-nom-ticket
|
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 \
|
curl -X POST \
|
||||||
-H "Authorization: token giteabu_1796c6aace0e2ef7e4fdb49cdc3bc1bf8ee31fbc" \
|
-H "Authorization: token $GITEA_TOKEN" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d '{"title":"feat(#XX): Titre","body":"Description\n\nCloses #XX","head":"feature/XX-nom-ticket","base":"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"
|
"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"
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
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: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/models/user.dart';
|
||||||
import 'package:p_tits_pas/services/auth_service.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_shell.dart';
|
||||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
|
|
||||||
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
|
/// 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.
|
/// Métier cartes / blog / messagerie : tickets C/D/E.
|
||||||
class ParentDashboardScreen extends StatefulWidget {
|
class ParentDashboardScreen extends StatefulWidget {
|
||||||
const ParentDashboardScreen({super.key});
|
const ParentDashboardScreen({super.key});
|
||||||
@@ -17,10 +21,16 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
QuotidienNavSection _section = QuotidienNavSection.liaison;
|
QuotidienNavSection _section = QuotidienNavSection.liaison;
|
||||||
AppUser? _user;
|
AppUser? _user;
|
||||||
|
|
||||||
|
List<CoupleGarde> _couples = const [];
|
||||||
|
String? _selectedCoupleId;
|
||||||
|
bool _couplesLoading = true;
|
||||||
|
String? _couplesError;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_loadUser();
|
_loadUser();
|
||||||
|
_loadCouples();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _loadUser() async {
|
Future<void> _loadUser() async {
|
||||||
@@ -28,6 +38,52 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
if (mounted) setState(() => _user = user);
|
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 {
|
String get _displayName {
|
||||||
final n = _user?.fullName.trim() ?? '';
|
final n = _user?.fullName.trim() ?? '';
|
||||||
if (n.isNotEmpty) return n;
|
if (n.isNotEmpty) return n;
|
||||||
@@ -52,11 +108,13 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
onProfileTap: () => _soon('Profil'),
|
onProfileTap: () => _soon('Profil'),
|
||||||
onSearchAmTap: () => _soon('Recherche AM'),
|
onSearchAmTap: () => _soon('Recherche AM'),
|
||||||
onSettingsTap: () => _soon('Paramètres'),
|
onSettingsTap: () => _soon('Paramètres'),
|
||||||
leftColumn: const QuotidienColumnPlaceholder(
|
leftColumn: _LeftColumn(
|
||||||
title: 'Cartes',
|
couples: _couples,
|
||||||
subtitle:
|
selectedCoupleId: _selectedCoupleId,
|
||||||
'Couple enfant–nounou et flux de cartes\n(à brancher — tickets #167 / #173).',
|
loading: _couplesLoading,
|
||||||
icon: Icons.style_outlined,
|
error: _couplesError,
|
||||||
|
onRetry: _loadCouples,
|
||||||
|
onCoupleSelected: _selectCouple,
|
||||||
),
|
),
|
||||||
centerColumn: const QuotidienColumnPlaceholder(
|
centerColumn: const QuotidienColumnPlaceholder(
|
||||||
title: 'Blog',
|
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';
|
static const String parents = '/parents';
|
||||||
/// Création dossier famille actif par le staff (#129) — body type register parent.
|
/// Création dossier famille actif par le staff (#129) — body type register parent.
|
||||||
static const String parentsDossier = '/parents/dossier';
|
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';
|
static const String assistantesMaternelles = '/assistantes-maternelles';
|
||||||
/// Création dossier AM actif par le staff (#156) — body type register AM.
|
/// Création dossier AM actif par le staff (#156) — body type register AM.
|
||||||
static const String assistantesMaternellesDossier =
|
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.
|
/// couleur charte par section ; l'inactive est la même, plus transparente.
|
||||||
static const double pillInactiveOpacity = 0.45;
|
static const double pillInactiveOpacity = 0.45;
|
||||||
static const String pillIvoryAsset = 'assets/images/bg_ivoire_pill.png';
|
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 pillYellowAsset = 'assets/images/bg_yellow_pill.png';
|
||||||
static const String pillPeachAsset = 'assets/images/bg_peach_pill.png';
|
static const String pillPeachAsset = 'assets/images/bg_peach_pill.png';
|
||||||
static const String pillTurquoiseAsset =
|
static const String pillTurquoiseAsset =
|
||||||
|
|||||||
Reference in New Issue
Block a user