Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da71803852 | ||
|
|
2380aa9826 | ||
|
|
c952113099 | ||
|
|
8204669ec9 | ||
|
|
76ab0f340a | ||
|
|
a0a5e15b04 | ||
|
|
823ea6cd22 | ||
|
|
dfac075a74 | ||
|
|
2d8b857a84 | ||
|
|
147051821a | ||
|
|
41f7006073 | ||
|
|
8d8627cf38 | ||
|
|
6a586110e7 | ||
|
|
f9fd8d73a8 | ||
|
|
93ee3a5549 | ||
|
|
db08aca714 | ||
|
|
494f0e4c19 | ||
|
|
9a4664a8ea | ||
|
|
bf00933f65 | ||
|
|
7b4650b81b | ||
|
|
b7ae07f5aa | ||
|
|
a88f791317 | ||
|
|
138398a4a0 | ||
|
|
7cf30643aa | ||
|
|
5eb3468fe0 | ||
|
|
df4f48e864 | ||
|
|
6f9136aae5 | ||
|
|
461c70df05 | ||
|
|
fa88d00657 | ||
|
|
6e18956a63 | ||
|
|
745349bc83 |
@@ -16,6 +16,8 @@ import { AllExceptionsFilter } from './common/filters/all_exceptions.filters';
|
|||||||
import { EnfantsModule } from './routes/enfants/enfants.module';
|
import { EnfantsModule } from './routes/enfants/enfants.module';
|
||||||
import { AppConfigModule } from './modules/config/config.module';
|
import { AppConfigModule } from './modules/config/config.module';
|
||||||
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
||||||
|
import { AbsencesGardeModule } from './modules/absences-garde';
|
||||||
|
import { CardsModule } from './modules/cards';
|
||||||
import { RelaisModule } from './routes/relais/relais.module';
|
import { RelaisModule } from './routes/relais/relais.module';
|
||||||
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
||||||
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||||
@@ -56,6 +58,8 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
|||||||
AuthModule,
|
AuthModule,
|
||||||
AppConfigModule,
|
AppConfigModule,
|
||||||
DocumentsLegauxModule,
|
DocumentsLegauxModule,
|
||||||
|
AbsencesGardeModule,
|
||||||
|
CardsModule,
|
||||||
RelaisModule,
|
RelaisModule,
|
||||||
DossiersModule,
|
DossiersModule,
|
||||||
SuppressionsModule,
|
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,4 +1,4 @@
|
|||||||
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn } from 'typeorm';
|
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn, ManyToOne } from 'typeorm';
|
||||||
import { Users } from './users.entity';
|
import { Users } from './users.entity';
|
||||||
import { AmChildren } from './am_children.entity';
|
import { AmChildren } from './am_children.entity';
|
||||||
|
|
||||||
@@ -37,22 +37,32 @@ export class AssistanteMaternelle {
|
|||||||
@Column({ name: 'ville_residence', length: 100, nullable: true })
|
@Column({ name: 'ville_residence', length: 100, nullable: true })
|
||||||
residence_city?: string;
|
residence_city?: string;
|
||||||
|
|
||||||
@Column( { name: 'date_agrement', type: 'date', nullable: true })
|
@Column({ name: 'date_agrement', type: 'date', nullable: true })
|
||||||
agreement_date?: Date;
|
agreement_date?: Date;
|
||||||
|
|
||||||
@Column( { name: 'annee_experience', type: 'smallint', nullable: true })
|
@Column({ name: 'annee_experience', type: 'smallint', nullable: true })
|
||||||
years_experience?: number;
|
years_experience?: number;
|
||||||
|
|
||||||
@Column( { name: 'specialite', length: 100, nullable: true })
|
@Column({ name: 'specialite', length: 100, nullable: true })
|
||||||
specialty?: string;
|
specialty?: string;
|
||||||
|
|
||||||
@Column( { name: 'place_disponible', type: 'integer', nullable: true })
|
@Column({ name: 'place_disponible', type: 'integer', nullable: true })
|
||||||
places_available?: number;
|
places_available?: number;
|
||||||
|
|
||||||
/** Numéro de dossier (format AAAA-NNNNNN), même valeur que sur utilisateurs (ticket #103) */
|
/** Numéro de dossier (format AAAA-NNNNNN), même valeur que sur utilisateurs (ticket #103) */
|
||||||
@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 AM (couple actif) — ticket #171.
|
||||||
|
*/
|
||||||
|
@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;
|
||||||
|
|
||||||
@OneToMany(() => AmChildren, (ac) => ac.am)
|
@OneToMany(() => AmChildren, (ac) => ac.am)
|
||||||
amChildren: AmChildren[];
|
amChildren: AmChildren[];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { CardInstance } from './card_instances.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
|
||||||
|
@Entity('card_audience_members', { schema: 'public' })
|
||||||
|
export class CardAudienceMember {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'id_card', type: 'uuid' })
|
||||||
|
id_card: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardInstance, (c) => c.audience, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_card', referencedColumnName: 'id' })
|
||||||
|
card: CardInstance;
|
||||||
|
|
||||||
|
@Column({ name: 'id_utilisateur', type: 'uuid' })
|
||||||
|
id_utilisateur: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => Users, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_utilisateur', referencedColumnName: 'id' })
|
||||||
|
user: Users;
|
||||||
|
|
||||||
|
@Column({ name: 'role_snapshot', type: 'varchar', length: 64 })
|
||||||
|
role_snapshot: string;
|
||||||
|
|
||||||
|
@Column({ name: 'is_creator', type: 'boolean', default: false })
|
||||||
|
is_creator: boolean;
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
OneToMany,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
UpdateDateColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { AmChildren } from './am_children.entity';
|
||||||
|
import { AbsencesGarde } from './absences_garde.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
import { CardType } from './card_types.entity';
|
||||||
|
import { CardAudienceMember } from './card_audience_members.entity';
|
||||||
|
import { CardResponse } from './card_responses.entity';
|
||||||
|
|
||||||
|
export enum CardInstanceStatutType {
|
||||||
|
OUVERTE = 'ouverte',
|
||||||
|
REFUSEE = 'refusee',
|
||||||
|
TRAITEE = 'traitee',
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum CardOperationType {
|
||||||
|
CREATE = 'create',
|
||||||
|
UPDATE = 'update',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_instances', { schema: 'public' })
|
||||||
|
export class CardInstance {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'type_code', type: 'varchar', length: 64 })
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardType, { onDelete: 'RESTRICT' })
|
||||||
|
@JoinColumn({ name: 'type_code', referencedColumnName: 'code' })
|
||||||
|
type: CardType;
|
||||||
|
|
||||||
|
@Column({ name: 'id_placement', type: 'uuid' })
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AmChildren, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_placement', referencedColumnName: 'id' })
|
||||||
|
placement: AmChildren;
|
||||||
|
|
||||||
|
@Column({ name: 'id_absence', type: 'uuid', nullable: true })
|
||||||
|
id_absence?: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AbsencesGarde, { nullable: true, onDelete: 'SET NULL' })
|
||||||
|
@JoinColumn({ name: 'id_absence', referencedColumnName: 'id' })
|
||||||
|
absence?: AbsencesGarde;
|
||||||
|
|
||||||
|
@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;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardOperationType,
|
||||||
|
enumName: 'card_operation_type',
|
||||||
|
name: 'operation',
|
||||||
|
default: CardOperationType.CREATE,
|
||||||
|
})
|
||||||
|
operation: CardOperationType;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardInstanceStatutType,
|
||||||
|
enumName: 'card_instance_statut_type',
|
||||||
|
name: 'statut',
|
||||||
|
default: CardInstanceStatutType.OUVERTE,
|
||||||
|
})
|
||||||
|
statut: CardInstanceStatutType;
|
||||||
|
|
||||||
|
@Column({ name: 'payload', type: 'jsonb', default: {} })
|
||||||
|
payload: Record<string, unknown>;
|
||||||
|
|
||||||
|
@Column({ name: 'purge_at', type: 'timestamptz' })
|
||||||
|
purge_at: Date;
|
||||||
|
|
||||||
|
@OneToMany(() => CardAudienceMember, (m) => m.card)
|
||||||
|
audience: CardAudienceMember[];
|
||||||
|
|
||||||
|
@OneToMany(() => CardResponse, (r) => r.card)
|
||||||
|
responses: CardResponse[];
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||||
|
modifie_le: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { CardInstance } from './card_instances.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
|
||||||
|
export enum CardResponseActionType {
|
||||||
|
ACCEPT = 'accept',
|
||||||
|
REFUSE = 'refuse',
|
||||||
|
ACK = 'ack',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_responses', { schema: 'public' })
|
||||||
|
export class CardResponse {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'id_card', type: 'uuid' })
|
||||||
|
id_card: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardInstance, (c) => c.responses, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_card', referencedColumnName: 'id' })
|
||||||
|
card: CardInstance;
|
||||||
|
|
||||||
|
@Column({ name: 'id_utilisateur', type: 'uuid' })
|
||||||
|
id_utilisateur: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => Users, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_utilisateur', referencedColumnName: 'id' })
|
||||||
|
user: Users;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardResponseActionType,
|
||||||
|
enumName: 'card_response_action_type',
|
||||||
|
name: 'action',
|
||||||
|
})
|
||||||
|
action: CardResponseActionType;
|
||||||
|
|
||||||
|
@Column({ name: 'comment', type: 'text', nullable: true })
|
||||||
|
comment?: string;
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
PrimaryColumn,
|
||||||
|
UpdateDateColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
|
||||||
|
export enum CardResponseModeType {
|
||||||
|
NONE = 'none',
|
||||||
|
ACK = 'ack',
|
||||||
|
ACCEPT_REFUSE = 'accept_refuse',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_types', { schema: 'public' })
|
||||||
|
export class CardType {
|
||||||
|
@PrimaryColumn({ name: 'code', type: 'varchar', length: 64 })
|
||||||
|
code: string;
|
||||||
|
|
||||||
|
@Column({ name: 'system', type: 'boolean', default: true })
|
||||||
|
system: boolean;
|
||||||
|
|
||||||
|
@Column({ name: 'titre', type: 'varchar', length: 120 })
|
||||||
|
titre: string;
|
||||||
|
|
||||||
|
@Column({ name: 'emitter_roles', type: 'text', array: true })
|
||||||
|
emitter_roles: string[];
|
||||||
|
|
||||||
|
@Column({ name: 'recipient_roles', type: 'text', array: true })
|
||||||
|
recipient_roles: string[];
|
||||||
|
|
||||||
|
@Column({ name: 'audience_resolver', type: 'varchar', length: 64 })
|
||||||
|
audience_resolver: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardResponseModeType,
|
||||||
|
enumName: 'card_response_mode_type',
|
||||||
|
name: 'response_mode',
|
||||||
|
})
|
||||||
|
response_mode: CardResponseModeType;
|
||||||
|
|
||||||
|
@Column({ name: 'retention_days', type: 'int', default: 14 })
|
||||||
|
retention_days: number;
|
||||||
|
|
||||||
|
@Column({ name: 'couleur', type: 'varchar', length: 32, nullable: true })
|
||||||
|
couleur?: 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,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,27 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
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]),
|
||||||
|
JwtModule.registerAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: (config: ConfigService) => ({
|
||||||
|
secret: config.get('jwt.accessSecret'),
|
||||||
|
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
|
||||||
|
}),
|
||||||
|
inject: [ConfigService],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
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,421 @@
|
|||||||
|
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 OU modification d’un congé déjà accepté (S2b)
|
||||||
|
if (
|
||||||
|
next === StatutAbsenceGardeType.EN_ATTENTE &&
|
||||||
|
(row.statut === StatutAbsenceGardeType.REFUSE ||
|
||||||
|
row.statut === StatutAbsenceGardeType.ACCEPTE)
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'L’AM ne valide pas elle-même (sauf republication / modification)',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
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,94 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Headers,
|
||||||
|
MessageEvent,
|
||||||
|
Query,
|
||||||
|
Sse,
|
||||||
|
UnauthorizedException,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
ApiBearerAuth,
|
||||||
|
ApiOperation,
|
||||||
|
ApiQuery,
|
||||||
|
ApiTags,
|
||||||
|
} from '@nestjs/swagger';
|
||||||
|
import { ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtService } from '@nestjs/jwt';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
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 { Public } from 'src/common/decorators/public.decorator';
|
||||||
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SSE Cartes — #195
|
||||||
|
* Auth : Bearer (recommandé) ou `?access_token=` (EventSource navigateur).
|
||||||
|
*/
|
||||||
|
@ApiTags('Cartes')
|
||||||
|
@Controller('cards')
|
||||||
|
export class CardsRealtimeController {
|
||||||
|
constructor(
|
||||||
|
private readonly realtime: CardsRealtimeService,
|
||||||
|
private readonly jwtService: JwtService,
|
||||||
|
private readonly configService: ConfigService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Sse('stream')
|
||||||
|
@Public()
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Flux SSE bulles (card.created|updated|deleted, response.added) — #195',
|
||||||
|
})
|
||||||
|
@ApiQuery({
|
||||||
|
name: 'access_token',
|
||||||
|
required: false,
|
||||||
|
description: 'JWT si pas de header Authorization (EventSource)',
|
||||||
|
})
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
async stream(
|
||||||
|
@Headers('authorization') authorization?: string,
|
||||||
|
@Query('access_token') accessToken?: string,
|
||||||
|
): Promise<Observable<MessageEvent>> {
|
||||||
|
const userId = await this.resolveUserId(authorization, accessToken);
|
||||||
|
return this.realtime.streamFor(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Variante gardée (clients qui envoient Bearer correctement). */
|
||||||
|
@Get('stream/info')
|
||||||
|
@UseGuards(AuthGuard, RolesGuard)
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
@ApiOperation({ summary: 'Debug : abonnés SSE pour mon user — #195' })
|
||||||
|
info(@User('id') userId: string) {
|
||||||
|
return {
|
||||||
|
user_id: userId,
|
||||||
|
subscribers: this.realtime.subscriberCount(userId),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolveUserId(
|
||||||
|
authorization?: string,
|
||||||
|
accessToken?: string,
|
||||||
|
): Promise<string> {
|
||||||
|
let token = accessToken?.trim();
|
||||||
|
if (!token && authorization?.startsWith('Bearer ')) {
|
||||||
|
token = authorization.slice(7).trim();
|
||||||
|
}
|
||||||
|
if (!token) {
|
||||||
|
throw new UnauthorizedException('Token manquant (Bearer ou access_token)');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const payload = await this.jwtService.verifyAsync<{ sub: string }>(token, {
|
||||||
|
secret: this.configService.get<string>('jwt.accessSecret'),
|
||||||
|
});
|
||||||
|
if (!payload?.sub) throw new UnauthorizedException('Token invalide');
|
||||||
|
return payload.sub;
|
||||||
|
} catch {
|
||||||
|
throw new UnauthorizedException('Token invalide ou expiré');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { MessageEvent } from '@nestjs/common';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
describe('CardsRealtimeService (#195)', () => {
|
||||||
|
let service: CardsRealtimeService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
service = new CardsRealtimeService();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
service.onModuleDestroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('émet card.created aux abonnés du user', async () => {
|
||||||
|
const events: MessageEvent[] = [];
|
||||||
|
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
|
||||||
|
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
expect(events[0]?.type).toBe('heartbeat');
|
||||||
|
expect(service.subscriberCount('user-a')).toBe(1);
|
||||||
|
|
||||||
|
service.emitToUsers(['user-a', 'user-b'], 'card.created', 'card-1', {
|
||||||
|
id: 'card-1',
|
||||||
|
});
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
|
||||||
|
const created = events.find((e) => e.type === 'card.created');
|
||||||
|
expect(created).toBeDefined();
|
||||||
|
expect((created!.data as { card_id: string }).card_id).toBe('card-1');
|
||||||
|
expect(service.subscriberCount('user-b')).toBe(0);
|
||||||
|
|
||||||
|
sub.unsubscribe();
|
||||||
|
expect(service.subscriberCount('user-a')).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ne diffuse pas aux users non abonnés', async () => {
|
||||||
|
const events: MessageEvent[] = [];
|
||||||
|
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
const before = events.length;
|
||||||
|
service.emitToUsers(['user-b'], 'card.updated', 'x');
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
expect(events.length).toBe(before);
|
||||||
|
sub.unsubscribe();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
import { Injectable, MessageEvent, OnModuleDestroy } from '@nestjs/common';
|
||||||
|
import { Observable, Subject, interval, merge, takeUntil } from 'rxjs';
|
||||||
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
|
export type CardRealtimeEventType =
|
||||||
|
| 'card.created'
|
||||||
|
| 'card.updated'
|
||||||
|
| 'card.deleted'
|
||||||
|
| 'response.added'
|
||||||
|
| 'heartbeat';
|
||||||
|
|
||||||
|
export interface CardRealtimePayload {
|
||||||
|
event: CardRealtimeEventType;
|
||||||
|
card_id?: string;
|
||||||
|
data?: unknown;
|
||||||
|
at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bus SSE in-memory par utilisateur (V1 mono-instance).
|
||||||
|
* Rooms = userId (audience carte).
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class CardsRealtimeService implements OnModuleDestroy {
|
||||||
|
private readonly byUser = new Map<string, Set<Subject<CardRealtimePayload>>>();
|
||||||
|
private readonly destroy$ = new Subject<void>();
|
||||||
|
|
||||||
|
onModuleDestroy(): void {
|
||||||
|
this.destroy$.next();
|
||||||
|
this.destroy$.complete();
|
||||||
|
for (const set of this.byUser.values()) {
|
||||||
|
for (const s of set) s.complete();
|
||||||
|
}
|
||||||
|
this.byUser.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Flux SSE pour un utilisateur authentifié. */
|
||||||
|
streamFor(userId: string): Observable<MessageEvent> {
|
||||||
|
const subject = new Subject<CardRealtimePayload>();
|
||||||
|
let set = this.byUser.get(userId);
|
||||||
|
if (!set) {
|
||||||
|
set = new Set();
|
||||||
|
this.byUser.set(userId, set);
|
||||||
|
}
|
||||||
|
set.add(subject);
|
||||||
|
|
||||||
|
const heartbeat$ = interval(25_000).pipe(
|
||||||
|
map(
|
||||||
|
(): CardRealtimePayload => ({
|
||||||
|
event: 'heartbeat',
|
||||||
|
at: new Date().toISOString(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
return new Observable<MessageEvent>((observer) => {
|
||||||
|
const sub = merge(subject, heartbeat$)
|
||||||
|
.pipe(takeUntil(this.destroy$))
|
||||||
|
.subscribe({
|
||||||
|
next: (payload) =>
|
||||||
|
observer.next({
|
||||||
|
type: payload.event,
|
||||||
|
data: payload,
|
||||||
|
} as MessageEvent),
|
||||||
|
error: (err) => observer.error(err),
|
||||||
|
complete: () => observer.complete(),
|
||||||
|
});
|
||||||
|
|
||||||
|
// ping initial
|
||||||
|
subject.next({
|
||||||
|
event: 'heartbeat',
|
||||||
|
at: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
sub.unsubscribe();
|
||||||
|
set!.delete(subject);
|
||||||
|
subject.complete();
|
||||||
|
if (set!.size === 0) this.byUser.delete(userId);
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
emitToUsers(
|
||||||
|
userIds: string[],
|
||||||
|
event: Exclude<CardRealtimeEventType, 'heartbeat'>,
|
||||||
|
cardId: string | undefined,
|
||||||
|
data?: unknown,
|
||||||
|
): void {
|
||||||
|
const unique = [...new Set(userIds.filter(Boolean))];
|
||||||
|
const payload: CardRealtimePayload = {
|
||||||
|
event,
|
||||||
|
card_id: cardId,
|
||||||
|
data,
|
||||||
|
at: new Date().toISOString(),
|
||||||
|
};
|
||||||
|
for (const uid of unique) {
|
||||||
|
const set = this.byUser.get(uid);
|
||||||
|
if (!set) continue;
|
||||||
|
for (const s of set) s.next(payload);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Test / debug : nombre d’abonnés actifs. */
|
||||||
|
subscriberCount(userId?: string): number {
|
||||||
|
if (userId) return this.byUser.get(userId)?.size ?? 0;
|
||||||
|
let n = 0;
|
||||||
|
for (const s of this.byUser.values()) n += s.size;
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
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 { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import {
|
||||||
|
CarteDto,
|
||||||
|
CreerCarteDto,
|
||||||
|
ListeCartesDto,
|
||||||
|
MajCarteDto,
|
||||||
|
RepondreCarteDto,
|
||||||
|
} from './dto/cards.dto';
|
||||||
|
|
||||||
|
@ApiTags('Cartes')
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
@Controller('cards')
|
||||||
|
@UseGuards(AuthGuard, RolesGuard)
|
||||||
|
export class CardsController {
|
||||||
|
constructor(private readonly cardsService: CardsService) {}
|
||||||
|
|
||||||
|
@Get('types')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Types SYSTEM émissibles pour mon rôle — #194' })
|
||||||
|
listerTypes(@User('role') role: RoleType) {
|
||||||
|
return this.cardsService.listerTypes(role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Feed bulles de l’utilisateur — #194' })
|
||||||
|
@ApiQuery({ name: 'placementId', required: false })
|
||||||
|
@ApiResponse({ status: 200, type: ListeCartesDto })
|
||||||
|
lister(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Query('placementId') placementId?: string,
|
||||||
|
): Promise<ListeCartesDto> {
|
||||||
|
return this.cardsService.lister(userId, role, placementId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@HttpCode(HttpStatus.CREATED)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Créer une bulle (+ hook absences_garde) — #194',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: CreerCarteDto })
|
||||||
|
@ApiResponse({ status: 201, type: CarteDto })
|
||||||
|
creer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Body() dto: CreerCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.creer(userId, role, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post(':id/respond')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Répondre (accept / refuse / ack) — #194' })
|
||||||
|
@ApiBody({ type: RepondreCarteDto })
|
||||||
|
repondre(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
@Body() dto: RepondreCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.repondre(userId, role, id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Modifier dates (créateur, ouverte/refusée) — #194',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: MajCarteDto })
|
||||||
|
maj(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
@Body() dto: MajCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.majEnAttente(userId, role, id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
@ApiOperation({ summary: 'Supprimer bulle (+ absence si non traitée) — #194' })
|
||||||
|
async supprimer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
await this.cardsService.supprimer(userId, role, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { AbsencesGardeModule } from '../absences-garde';
|
||||||
|
import { CardType } from 'src/entities/card_types.entity';
|
||||||
|
import { CardInstance } from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import { CardResponse } from 'src/entities/card_responses.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { CardsController } from './cards.controller';
|
||||||
|
import { CardsRealtimeController } from './cards-realtime.controller';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
AbsencesGardeModule,
|
||||||
|
TypeOrmModule.forFeature([
|
||||||
|
CardType,
|
||||||
|
CardInstance,
|
||||||
|
CardAudienceMember,
|
||||||
|
CardResponse,
|
||||||
|
AmChildren,
|
||||||
|
ParentsChildren,
|
||||||
|
]),
|
||||||
|
JwtModule.registerAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: (config: ConfigService) => ({
|
||||||
|
secret: config.get('jwt.accessSecret'),
|
||||||
|
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
|
||||||
|
}),
|
||||||
|
inject: [ConfigService],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
controllers: [CardsController, CardsRealtimeController],
|
||||||
|
providers: [CardsService, CardsRealtimeService],
|
||||||
|
exports: [CardsService, CardsRealtimeService],
|
||||||
|
})
|
||||||
|
export class CardsModule {}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
|
import { ForbiddenException } from '@nestjs/common';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||||
|
import { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||||
|
import {
|
||||||
|
CardInstance,
|
||||||
|
CardInstanceStatutType,
|
||||||
|
CardOperationType,
|
||||||
|
} from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import { CardResponse } from 'src/entities/card_responses.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 { StatutAbsenceGardeType, TypeAbsenceGardeType } from 'src/entities/absences_garde.entity';
|
||||||
|
|
||||||
|
describe('CardsService (#194)', () => {
|
||||||
|
let service: CardsService;
|
||||||
|
|
||||||
|
const typesRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
|
const cardsRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(async (x) => ({ ...x, id: x.id ?? 'card-1', cree_le: new Date(), modifie_le: new Date() })),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
delete: jest.fn(),
|
||||||
|
createQueryBuilder: jest.fn(),
|
||||||
|
manager: { query: jest.fn() },
|
||||||
|
};
|
||||||
|
const audienceRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
find: jest.fn(),
|
||||||
|
};
|
||||||
|
const responsesRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(),
|
||||||
|
};
|
||||||
|
const amChildrenRepo = { findOne: jest.fn() };
|
||||||
|
const parentsChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
|
const absencesService = {
|
||||||
|
creer: jest.fn(),
|
||||||
|
maj: jest.fn(),
|
||||||
|
supprimer: jest.fn(),
|
||||||
|
};
|
||||||
|
const realtime = { emitToUsers: jest.fn() };
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
CardsService,
|
||||||
|
{ provide: getRepositoryToken(CardType), useValue: typesRepo },
|
||||||
|
{ provide: getRepositoryToken(CardInstance), useValue: cardsRepo },
|
||||||
|
{ provide: getRepositoryToken(CardAudienceMember), useValue: audienceRepo },
|
||||||
|
{ provide: getRepositoryToken(CardResponse), useValue: responsesRepo },
|
||||||
|
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||||
|
{ provide: getRepositoryToken(ParentsChildren), useValue: parentsChildrenRepo },
|
||||||
|
{ provide: AbsencesGardeService, useValue: absencesService },
|
||||||
|
{ provide: CardsRealtimeService, useValue: realtime },
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
service = module.get(CardsService);
|
||||||
|
jest.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('AM crée congé → absence + carte ouverte + audience parents', async () => {
|
||||||
|
typesRepo.findOne.mockResolvedValue({
|
||||||
|
code: 'conge_am',
|
||||||
|
system: true,
|
||||||
|
titre: 'Congé AM',
|
||||||
|
emitter_roles: [RoleType.ASSISTANTE_MATERNELLE],
|
||||||
|
recipient_roles: [RoleType.PARENT],
|
||||||
|
audience_resolver: 'couple_parents',
|
||||||
|
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||||
|
retention_days: 14,
|
||||||
|
couleur: 'lavender',
|
||||||
|
});
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
absencesService.creer.mockResolvedValue({
|
||||||
|
id: 'abs-1',
|
||||||
|
type: TypeAbsenceGardeType.CONGE_AM,
|
||||||
|
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
});
|
||||||
|
parentsChildrenRepo.find.mockResolvedValue([
|
||||||
|
{ parentId: 'p-1', enfantId: 'e-1' },
|
||||||
|
{ parentId: 'p-2', enfantId: 'e-1' },
|
||||||
|
]);
|
||||||
|
cardsRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'card-1',
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
id_absence: 'abs-1',
|
||||||
|
cree_par: 'am-1',
|
||||||
|
operation: CardOperationType.CREATE,
|
||||||
|
statut: CardInstanceStatutType.OUVERTE,
|
||||||
|
payload: { date_debut: '2026-11-01', date_fin: '2026-11-07' },
|
||||||
|
purge_at: new Date(),
|
||||||
|
cree_le: new Date(),
|
||||||
|
modifie_le: new Date(),
|
||||||
|
type: {
|
||||||
|
titre: 'Congé AM',
|
||||||
|
couleur: 'lavender',
|
||||||
|
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||||
|
retention_days: 14,
|
||||||
|
},
|
||||||
|
responses: [],
|
||||||
|
audience: [
|
||||||
|
{ id_utilisateur: 'am-1' },
|
||||||
|
{ id_utilisateur: 'p-1' },
|
||||||
|
{ id_utilisateur: 'p-2' },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
date_debut: '2026-11-01',
|
||||||
|
date_fin: '2026-11-07',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(absencesService.creer).toHaveBeenCalled();
|
||||||
|
expect(audienceRepo.save).toHaveBeenCalled();
|
||||||
|
expect(realtime.emitToUsers).toHaveBeenCalledWith(
|
||||||
|
['am-1', 'p-1', 'p-2'],
|
||||||
|
'card.created',
|
||||||
|
'card-1',
|
||||||
|
expect.any(Object),
|
||||||
|
);
|
||||||
|
expect(res.type_code).toBe('conge_am');
|
||||||
|
expect(res.statut).toBe(CardInstanceStatutType.OUVERTE);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parent ne peut pas émettre conge_am', async () => {
|
||||||
|
typesRepo.findOne.mockResolvedValue({
|
||||||
|
code: 'conge_am',
|
||||||
|
system: true,
|
||||||
|
emitter_roles: [RoleType.ASSISTANTE_MATERNELLE],
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
service.creer('p-1', RoleType.PARENT, {
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
date_debut: '2026-11-01',
|
||||||
|
date_fin: '2026-11-07',
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(ForbiddenException);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,489 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { IsNull, Repository } from 'typeorm';
|
||||||
|
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||||
|
import {
|
||||||
|
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 { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||||
|
import {
|
||||||
|
CardInstance,
|
||||||
|
CardInstanceStatutType,
|
||||||
|
CardOperationType,
|
||||||
|
} from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import {
|
||||||
|
CardResponse,
|
||||||
|
CardResponseActionType,
|
||||||
|
} from 'src/entities/card_responses.entity';
|
||||||
|
import {
|
||||||
|
CarteDto,
|
||||||
|
CreerCarteDto,
|
||||||
|
ListeCartesDto,
|
||||||
|
MajCarteDto,
|
||||||
|
RepondreCarteDto,
|
||||||
|
} from './dto/cards.dto';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CardsService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(CardType)
|
||||||
|
private readonly typesRepo: Repository<CardType>,
|
||||||
|
@InjectRepository(CardInstance)
|
||||||
|
private readonly cardsRepo: Repository<CardInstance>,
|
||||||
|
@InjectRepository(CardAudienceMember)
|
||||||
|
private readonly audienceRepo: Repository<CardAudienceMember>,
|
||||||
|
@InjectRepository(CardResponse)
|
||||||
|
private readonly responsesRepo: Repository<CardResponse>,
|
||||||
|
@InjectRepository(AmChildren)
|
||||||
|
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||||
|
@InjectRepository(ParentsChildren)
|
||||||
|
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||||
|
private readonly absencesService: AbsencesGardeService,
|
||||||
|
private readonly realtime: CardsRealtimeService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async listerTypes(role: RoleType): Promise<CardType[]> {
|
||||||
|
const all = await this.typesRepo.find({ where: { system: true } });
|
||||||
|
return all.filter((t) => t.emitter_roles.includes(role));
|
||||||
|
}
|
||||||
|
|
||||||
|
async lister(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
placementId?: string,
|
||||||
|
): Promise<ListeCartesDto> {
|
||||||
|
const qb = this.cardsRepo
|
||||||
|
.createQueryBuilder('c')
|
||||||
|
.innerJoin('c.audience', 'aud', 'aud.id_utilisateur = :userId', { userId })
|
||||||
|
.leftJoinAndSelect('c.type', 'type')
|
||||||
|
.leftJoinAndSelect('c.responses', 'responses')
|
||||||
|
.where('c.purge_at > now()')
|
||||||
|
.orderBy(
|
||||||
|
`CASE c.statut WHEN 'refusee' THEN 0 WHEN 'ouverte' THEN 1 ELSE 2 END`,
|
||||||
|
'ASC',
|
||||||
|
)
|
||||||
|
.addOrderBy('c.modifie_le', 'DESC');
|
||||||
|
|
||||||
|
if (placementId) {
|
||||||
|
await this.assertPlacementAccess(userId, role, placementId);
|
||||||
|
qb.andWhere('c.id_placement = :placementId', { placementId });
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = await qb.getMany();
|
||||||
|
return {
|
||||||
|
items: rows.map((c) => this.toDto(c, userId)),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async creer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
dto: CreerCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
if (dto.date_fin < dto.date_debut) {
|
||||||
|
throw new BadRequestException('date_fin < date_debut');
|
||||||
|
}
|
||||||
|
|
||||||
|
const type = await this.typesRepo.findOne({ where: { code: dto.type_code } });
|
||||||
|
if (!type || !type.system) {
|
||||||
|
throw new NotFoundException('Type de carte inconnu');
|
||||||
|
}
|
||||||
|
if (!type.emitter_roles.includes(role)) {
|
||||||
|
throw new ForbiddenException('Vous ne pouvez pas émettre ce type de carte');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placement = await this.assertPlacementAccess(
|
||||||
|
userId,
|
||||||
|
role,
|
||||||
|
dto.id_placement,
|
||||||
|
);
|
||||||
|
const operation = dto.operation ?? CardOperationType.CREATE;
|
||||||
|
|
||||||
|
let absenceId = dto.id_absence;
|
||||||
|
const absenceType = this.mapAbsenceType(dto.type_code);
|
||||||
|
|
||||||
|
if (operation === CardOperationType.CREATE) {
|
||||||
|
const absence = await this.absencesService.creer(userId, role, {
|
||||||
|
id_placement: dto.id_placement,
|
||||||
|
type: absenceType,
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
});
|
||||||
|
absenceId = absence.id;
|
||||||
|
} else {
|
||||||
|
if (!absenceId) {
|
||||||
|
throw new BadRequestException('id_absence requis pour operation=update');
|
||||||
|
}
|
||||||
|
await this.absencesService.maj(userId, role, absenceId, {
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
// Congé accepté modifié → repasse en attente via cartes respond flow;
|
||||||
|
// pour absence enfant update immédiat déjà fait.
|
||||||
|
...(dto.type_code === 'conge_am'
|
||||||
|
? { statut: StatutAbsenceGardeType.EN_ATTENTE }
|
||||||
|
: {}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const statutInitial =
|
||||||
|
type.response_mode === CardResponseModeType.NONE
|
||||||
|
? CardInstanceStatutType.TRAITEE
|
||||||
|
: CardInstanceStatutType.OUVERTE;
|
||||||
|
|
||||||
|
const card = this.cardsRepo.create({
|
||||||
|
type_code: type.code,
|
||||||
|
id_placement: dto.id_placement,
|
||||||
|
id_absence: absenceId,
|
||||||
|
cree_par: userId,
|
||||||
|
operation,
|
||||||
|
statut: statutInitial,
|
||||||
|
payload: {
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif ?? null,
|
||||||
|
},
|
||||||
|
purge_at: this.purgeAt(type.retention_days, statutInitial),
|
||||||
|
});
|
||||||
|
const saved = await this.cardsRepo.save(card);
|
||||||
|
|
||||||
|
if (absenceId) {
|
||||||
|
await this.linkAbsenceCard(absenceId, saved.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.buildAudience(saved, type, placement, userId, role);
|
||||||
|
|
||||||
|
const full = await this.loadCard(saved.id);
|
||||||
|
const dtoOut = this.toDto(full, userId);
|
||||||
|
this.emitAudience(full, 'card.created', dtoOut);
|
||||||
|
return dtoOut;
|
||||||
|
}
|
||||||
|
|
||||||
|
async repondre(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
dto: RepondreCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
await this.assertInAudience(card, userId);
|
||||||
|
if (card.statut !== CardInstanceStatutType.OUVERTE) {
|
||||||
|
throw new BadRequestException('Cette carte n’est plus ouverte');
|
||||||
|
}
|
||||||
|
if (card.cree_par === userId) {
|
||||||
|
throw new ForbiddenException('Le créateur ne répond pas à sa propre carte');
|
||||||
|
}
|
||||||
|
|
||||||
|
const mode = card.type.response_mode;
|
||||||
|
if (mode === CardResponseModeType.NONE) {
|
||||||
|
throw new BadRequestException('Ce type de carte ne demande pas de réponse');
|
||||||
|
}
|
||||||
|
if (mode === CardResponseModeType.ACK && dto.action !== CardResponseActionType.ACK) {
|
||||||
|
throw new BadRequestException('Action attendue : ack');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
mode === CardResponseModeType.ACCEPT_REFUSE &&
|
||||||
|
dto.action !== CardResponseActionType.ACCEPT &&
|
||||||
|
dto.action !== CardResponseActionType.REFUSE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Action attendue : accept ou refuse');
|
||||||
|
}
|
||||||
|
if (dto.action === CardResponseActionType.REFUSE && !dto.comment?.trim()) {
|
||||||
|
throw new BadRequestException('Motivation obligatoire en cas de refus');
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.responsesRepo.save(
|
||||||
|
this.responsesRepo.create({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: userId,
|
||||||
|
action: dto.action,
|
||||||
|
comment: dto.comment?.trim(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (card.id_absence) {
|
||||||
|
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
statut: StatutAbsenceGardeType.ACCEPTE,
|
||||||
|
});
|
||||||
|
card.statut = CardInstanceStatutType.TRAITEE;
|
||||||
|
} else if (dto.action === CardResponseActionType.REFUSE) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
statut: StatutAbsenceGardeType.REFUSE,
|
||||||
|
motif: dto.comment!.trim(),
|
||||||
|
});
|
||||||
|
card.statut = CardInstanceStatutType.REFUSEE;
|
||||||
|
}
|
||||||
|
} else if (dto.action === CardResponseActionType.ACK) {
|
||||||
|
card.statut = CardInstanceStatutType.TRAITEE;
|
||||||
|
}
|
||||||
|
|
||||||
|
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||||
|
await this.cardsRepo.save(card);
|
||||||
|
const full = await this.loadCard(cardId);
|
||||||
|
const dtoOut = this.toDto(full, userId);
|
||||||
|
this.emitAudience(full, 'response.added', {
|
||||||
|
action: dto.action,
|
||||||
|
card: dtoOut,
|
||||||
|
});
|
||||||
|
this.emitAudience(full, 'card.updated', dtoOut);
|
||||||
|
return dtoOut;
|
||||||
|
}
|
||||||
|
|
||||||
|
async majEnAttente(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
dto: MajCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
if (card.cree_par !== userId) {
|
||||||
|
throw new ForbiddenException('Seul le créateur peut modifier cette carte');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
card.statut !== CardInstanceStatutType.OUVERTE &&
|
||||||
|
card.statut !== CardInstanceStatutType.REFUSEE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Carte non modifiable dans cet état');
|
||||||
|
}
|
||||||
|
|
||||||
|
const debut =
|
||||||
|
dto.date_debut ?? String(card.payload?.['date_debut'] ?? '');
|
||||||
|
const fin = dto.date_fin ?? String(card.payload?.['date_fin'] ?? '');
|
||||||
|
if (!debut || !fin || fin < debut) {
|
||||||
|
throw new BadRequestException('Dates invalides');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (card.id_absence) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
date_debut: debut,
|
||||||
|
date_fin: fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
card.payload = {
|
||||||
|
...card.payload,
|
||||||
|
date_debut: debut,
|
||||||
|
date_fin: fin,
|
||||||
|
motif: dto.motif ?? card.payload?.['motif'] ?? null,
|
||||||
|
};
|
||||||
|
card.statut = CardInstanceStatutType.OUVERTE;
|
||||||
|
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||||
|
await this.cardsRepo.save(card);
|
||||||
|
const full = await this.loadCard(cardId);
|
||||||
|
const dtoOut = this.toDto(full, userId);
|
||||||
|
this.emitAudience(full, 'card.updated', dtoOut);
|
||||||
|
return dtoOut;
|
||||||
|
}
|
||||||
|
|
||||||
|
async supprimer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
if (card.cree_par !== userId) {
|
||||||
|
throw new ForbiddenException('Seul le créateur peut supprimer cette carte');
|
||||||
|
}
|
||||||
|
const audienceIds = await this.audienceUserIds(card);
|
||||||
|
if (card.id_absence) {
|
||||||
|
const absStatut =
|
||||||
|
card.statut === CardInstanceStatutType.TRAITEE
|
||||||
|
? null
|
||||||
|
: card.id_absence;
|
||||||
|
// Supprime l’absence liée si pas encore acceptée définitivement
|
||||||
|
if (
|
||||||
|
card.statut === CardInstanceStatutType.OUVERTE ||
|
||||||
|
card.statut === CardInstanceStatutType.REFUSEE
|
||||||
|
) {
|
||||||
|
await this.absencesService.supprimer(userId, role, card.id_absence);
|
||||||
|
}
|
||||||
|
void absStatut;
|
||||||
|
}
|
||||||
|
await this.cardsRepo.delete({ id: cardId });
|
||||||
|
this.realtime.emitToUsers(audienceIds, 'card.deleted', cardId, {
|
||||||
|
id: cardId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private emitAudience(
|
||||||
|
card: CardInstance,
|
||||||
|
event: 'card.created' | 'card.updated' | 'response.added',
|
||||||
|
data: unknown,
|
||||||
|
): void {
|
||||||
|
const ids = (card.audience ?? []).map((a) => a.id_utilisateur);
|
||||||
|
if (ids.length === 0) return;
|
||||||
|
this.realtime.emitToUsers(ids, event, card.id, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async audienceUserIds(card: CardInstance): Promise<string[]> {
|
||||||
|
if (card.audience?.length) {
|
||||||
|
return card.audience.map((a) => a.id_utilisateur);
|
||||||
|
}
|
||||||
|
const rows = await this.audienceRepo.find({ where: { id_card: card.id } });
|
||||||
|
return rows.map((r) => r.id_utilisateur);
|
||||||
|
}
|
||||||
|
|
||||||
|
private mapAbsenceType(typeCode: string): TypeAbsenceGardeType {
|
||||||
|
if (typeCode === 'absence_enfant' || typeCode === 'absence_enfant_modif') {
|
||||||
|
return TypeAbsenceGardeType.ABSENCE_ENFANT;
|
||||||
|
}
|
||||||
|
if (typeCode === 'conge_am') return TypeAbsenceGardeType.CONGE_AM;
|
||||||
|
if (typeCode === 'arret_maladie_am') {
|
||||||
|
return TypeAbsenceGardeType.ARRET_MALADIE_AM;
|
||||||
|
}
|
||||||
|
throw new BadRequestException(`Type non mappé à une absence: ${typeCode}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async linkAbsenceCard(absenceId: string, cardId: string): Promise<void> {
|
||||||
|
// Update direct pour éviter droits maj vides
|
||||||
|
await this.cardsRepo.manager.query(
|
||||||
|
`UPDATE absences_garde SET id_card_instance = $1, modifie_le = now() WHERE id = $2`,
|
||||||
|
[cardId, absenceId],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async buildAudience(
|
||||||
|
card: CardInstance,
|
||||||
|
type: CardType,
|
||||||
|
placement: AmChildren,
|
||||||
|
creatorId: string,
|
||||||
|
creatorRole: RoleType,
|
||||||
|
): Promise<void> {
|
||||||
|
const members: Partial<CardAudienceMember>[] = [
|
||||||
|
{
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: creatorId,
|
||||||
|
role_snapshot: creatorRole,
|
||||||
|
is_creator: true,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
if (type.audience_resolver === 'couple_am') {
|
||||||
|
members.push({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: placement.amId,
|
||||||
|
role_snapshot: RoleType.ASSISTANTE_MATERNELLE,
|
||||||
|
is_creator: false,
|
||||||
|
});
|
||||||
|
} else if (type.audience_resolver === 'couple_parents') {
|
||||||
|
const liens = await this.parentsChildrenRepo.find({
|
||||||
|
where: { enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
for (const l of liens) {
|
||||||
|
if (l.parentId === creatorId) continue;
|
||||||
|
members.push({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: l.parentId,
|
||||||
|
role_snapshot: RoleType.PARENT,
|
||||||
|
is_creator: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// dédup
|
||||||
|
const seen = new Set<string>();
|
||||||
|
const unique = members.filter((m) => {
|
||||||
|
const k = m.id_utilisateur!;
|
||||||
|
if (seen.has(k)) return false;
|
||||||
|
seen.add(k);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
await this.audienceRepo.save(this.audienceRepo.create(unique));
|
||||||
|
}
|
||||||
|
|
||||||
|
private purgeAt(
|
||||||
|
retentionDays: number,
|
||||||
|
statut: CardInstanceStatutType,
|
||||||
|
): Date {
|
||||||
|
const days =
|
||||||
|
statut === CardInstanceStatutType.OUVERTE
|
||||||
|
? Math.max(retentionDays, 15)
|
||||||
|
: retentionDays;
|
||||||
|
return new Date(Date.now() + days * 24 * 60 * 60 * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async loadCard(id: string): Promise<CardInstance> {
|
||||||
|
const card = await this.cardsRepo.findOne({
|
||||||
|
where: { id },
|
||||||
|
relations: ['type', 'responses', 'audience'],
|
||||||
|
});
|
||||||
|
if (!card) throw new NotFoundException('Carte introuvable');
|
||||||
|
return card;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async assertInAudience(card: CardInstance, userId: string): Promise<void> {
|
||||||
|
const ok = (card.audience ?? []).some((a) => a.id_utilisateur === userId);
|
||||||
|
if (!ok) {
|
||||||
|
const row = await this.audienceRepo.findOne({
|
||||||
|
where: { id_card: card.id, id_utilisateur: userId },
|
||||||
|
});
|
||||||
|
if (!row) throw new ForbiddenException('Carte hors de votre audience');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async assertPlacementAccess(
|
||||||
|
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 introuvable ou inactif');
|
||||||
|
}
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
if (placement.amId !== userId) {
|
||||||
|
throw new ForbiddenException('Placement non autorisé');
|
||||||
|
}
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
const lien = await this.parentsChildrenRepo.findOne({
|
||||||
|
where: { parentId: userId, enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
if (!lien) throw new ForbiddenException('Placement non autorisé');
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException('Rôle non autorisé');
|
||||||
|
}
|
||||||
|
|
||||||
|
private toDto(card: CardInstance, userId: string): CarteDto {
|
||||||
|
const lastRefuse = [...(card.responses ?? [])]
|
||||||
|
.reverse()
|
||||||
|
.find((r) => r.action === CardResponseActionType.REFUSE);
|
||||||
|
return {
|
||||||
|
id: card.id,
|
||||||
|
type_code: card.type_code,
|
||||||
|
titre: card.type?.titre ?? card.type_code,
|
||||||
|
couleur: card.type?.couleur ?? null,
|
||||||
|
id_placement: card.id_placement,
|
||||||
|
id_absence: card.id_absence ?? null,
|
||||||
|
operation: card.operation,
|
||||||
|
statut: card.statut,
|
||||||
|
payload: card.payload ?? {},
|
||||||
|
purge_at: card.purge_at?.toISOString?.() ?? String(card.purge_at),
|
||||||
|
cree_par: card.cree_par ?? null,
|
||||||
|
is_creator: card.cree_par === userId,
|
||||||
|
response_mode: card.type?.response_mode,
|
||||||
|
last_refuse_comment: lastRefuse?.comment ?? null,
|
||||||
|
cree_le: card.cree_le?.toISOString?.() ?? String(card.cree_le),
|
||||||
|
modifie_le: card.modifie_le?.toISOString?.() ?? String(card.modifie_le),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
import {
|
||||||
|
IsDateString,
|
||||||
|
IsEnum,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
IsUUID,
|
||||||
|
MaxLength,
|
||||||
|
MinLength,
|
||||||
|
ValidateIf,
|
||||||
|
} from 'class-validator';
|
||||||
|
import { CardInstanceStatutType, CardOperationType } from 'src/entities/card_instances.entity';
|
||||||
|
import { CardResponseActionType } from 'src/entities/card_responses.entity';
|
||||||
|
|
||||||
|
export class CreerCarteDto {
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'absence_enfant | absence_enfant_modif | conge_am | arret_maladie_am',
|
||||||
|
})
|
||||||
|
@IsString()
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
@IsUUID()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@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;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({
|
||||||
|
description: 'Requis pour operation=update (même id absences_garde)',
|
||||||
|
})
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
id_absence?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ enum: CardOperationType, default: CardOperationType.CREATE })
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(CardOperationType)
|
||||||
|
operation?: CardOperationType;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class RepondreCarteDto {
|
||||||
|
@ApiProperty({ enum: CardResponseActionType })
|
||||||
|
@IsEnum(CardResponseActionType)
|
||||||
|
action: CardResponseActionType;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ description: 'Obligatoire si action=refuse' })
|
||||||
|
@ValidateIf((o) => o.action === CardResponseActionType.REFUSE)
|
||||||
|
@IsString()
|
||||||
|
@MinLength(1)
|
||||||
|
@MaxLength(2000)
|
||||||
|
comment?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class MajCarteDto {
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_debut?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_fin?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(2000)
|
||||||
|
motif?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CarteDto {
|
||||||
|
@ApiProperty()
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
titre: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
couleur?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
id_absence?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: CardOperationType })
|
||||||
|
operation: CardOperationType;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: CardInstanceStatutType })
|
||||||
|
statut: CardInstanceStatutType;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
payload: Record<string, unknown>;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
purge_at: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
cree_par?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
is_creator: boolean;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
response_mode?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
last_refuse_comment?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
cree_le: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
modifie_le: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ListeCartesDto {
|
||||||
|
@ApiProperty({ type: [CarteDto] })
|
||||||
|
items: CarteDto[];
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export { CardsModule } from './cards.module';
|
||||||
|
export { CardsService } from './cards.service';
|
||||||
|
export { CardsRealtimeService } from './cards-realtime.service';
|
||||||
@@ -10,7 +10,10 @@ describe('AssistantesMaternellesController', () => {
|
|||||||
const authServiceMock = {
|
const authServiceMock = {
|
||||||
createAmDossierStaff: jest.fn(),
|
createAmDossierStaff: jest.fn(),
|
||||||
};
|
};
|
||||||
const amServiceMock = {};
|
const amServiceMock = {
|
||||||
|
listerCouplesGarde: jest.fn(),
|
||||||
|
definirCoupleGardeCourant: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
@@ -66,4 +69,29 @@ describe('AssistantesMaternellesController', () => {
|
|||||||
);
|
);
|
||||||
expect(res.numero_dossier).toBe('2026-000001');
|
expect(res.numero_dossier).toBe('2026-000001');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('listerCouplesGarde délègue au service (#171)', async () => {
|
||||||
|
amServiceMock.listerCouplesGarde.mockResolvedValue({
|
||||||
|
couples: [],
|
||||||
|
couple_courant_id: null,
|
||||||
|
});
|
||||||
|
const res = await controller.listerCouplesGarde('am-uuid');
|
||||||
|
expect(amServiceMock.listerCouplesGarde).toHaveBeenCalledWith('am-uuid');
|
||||||
|
expect(res.couple_courant_id).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('definirCoupleGardeCourant délègue au service (#171)', async () => {
|
||||||
|
amServiceMock.definirCoupleGardeCourant.mockResolvedValue({
|
||||||
|
couples: [{ id: 'pl-1', courant: true }],
|
||||||
|
couple_courant_id: 'pl-1',
|
||||||
|
});
|
||||||
|
const res = await controller.definirCoupleGardeCourant('am-uuid', {
|
||||||
|
couple_id: 'pl-1',
|
||||||
|
});
|
||||||
|
expect(amServiceMock.definirCoupleGardeCourant).toHaveBeenCalledWith(
|
||||||
|
'am-uuid',
|
||||||
|
'pl-1',
|
||||||
|
);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-1');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {
|
|||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
Post,
|
Post,
|
||||||
|
Put,
|
||||||
Body,
|
Body,
|
||||||
Patch,
|
Patch,
|
||||||
Param,
|
Param,
|
||||||
@@ -20,6 +21,8 @@ import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
|||||||
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
||||||
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
|
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
|
||||||
import { StaffCreateAmDossierResponseDto } from './dto/staff-create-am-dossier-response.dto';
|
import { StaffCreateAmDossierResponseDto } from './dto/staff-create-am-dossier-response.dto';
|
||||||
|
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
|
||||||
|
import { DefinirCoupleGardeCourantAmDto } from './dto/definir-couple-garde-courant-am.dto';
|
||||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
import { User } from 'src/common/decorators/user.decorator';
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
@@ -83,6 +86,36 @@ export class AssistantesMaternellesController {
|
|||||||
return mapAmsForApi(ams);
|
return mapAmsForApi(ams);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('me/couples-garde')
|
||||||
|
@Roles(RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Couples de garde de l’AM connectée — ticket #171',
|
||||||
|
description:
|
||||||
|
'Placements actifs (enfant + parents) pour peupler le bandeau couple TdB AM, ' +
|
||||||
|
'avec indication du couple courant.',
|
||||||
|
})
|
||||||
|
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
|
||||||
|
listerCouplesGarde(
|
||||||
|
@User('id') userId: string,
|
||||||
|
): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
return this.assistantesMaternellesService.listerCouplesGarde(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put('me/couples-garde/courant')
|
||||||
|
@Roles(RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Définir le couple de garde courant (AM) — ticket #171' })
|
||||||
|
@ApiBody({ type: DefinirCoupleGardeCourantAmDto })
|
||||||
|
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
|
||||||
|
definirCoupleGardeCourant(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@Body() dto: DefinirCoupleGardeCourantAmDto,
|
||||||
|
): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
return this.assistantesMaternellesService.definirCoupleGardeCourant(
|
||||||
|
userId,
|
||||||
|
dto.couple_id,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@Roles(RoleType.SUPER_ADMIN, RoleType.GESTIONNAIRE, RoleType.ADMINISTRATEUR)
|
@Roles(RoleType.SUPER_ADMIN, RoleType.GESTIONNAIRE, RoleType.ADMINISTRATEUR)
|
||||||
@Get(':id')
|
@Get(':id')
|
||||||
@ApiParam({ name: 'id', description: "UUID de la nounou" })
|
@ApiParam({ name: 'id', description: "UUID de la nounou" })
|
||||||
|
|||||||
@@ -4,13 +4,21 @@ import { AssistantesMaternellesController } from './assistantes_maternelles.cont
|
|||||||
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { Children } from 'src/entities/children.entity';
|
import { Children } from 'src/entities/children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { Users } from 'src/entities/users.entity';
|
import { Users } from 'src/entities/users.entity';
|
||||||
import { AuthModule } from '../auth/auth.module';
|
import { AuthModule } from '../auth/auth.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [TypeOrmModule.forFeature([AssistanteMaternelle, AmChildren, Children, Users]),
|
imports: [
|
||||||
AuthModule
|
TypeOrmModule.forFeature([
|
||||||
|
AssistanteMaternelle,
|
||||||
|
AmChildren,
|
||||||
|
Children,
|
||||||
|
Users,
|
||||||
|
ParentsChildren,
|
||||||
|
]),
|
||||||
|
AuthModule,
|
||||||
],
|
],
|
||||||
controllers: [AssistantesMaternellesController],
|
controllers: [AssistantesMaternellesController],
|
||||||
providers: [AssistantesMaternellesService],
|
providers: [AssistantesMaternellesService],
|
||||||
@@ -19,4 +27,4 @@ import { AuthModule } from '../auth/auth.module';
|
|||||||
TypeOrmModule,
|
TypeOrmModule,
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AssistantesMaternellesModule { }
|
export class AssistantesMaternellesModule {}
|
||||||
|
|||||||
@@ -1,18 +1,150 @@
|
|||||||
|
import { NotFoundException } from '@nestjs/common';
|
||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
import { AssistantesMaternellesService } from './assistantes_maternelles.service';
|
import { AssistantesMaternellesService } from './assistantes_maternelles.service';
|
||||||
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
|
import { Users } from 'src/entities/users.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { Children } from 'src/entities/children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
|
||||||
describe('AssistantesMaternellesService', () => {
|
describe('AssistantesMaternellesService — couples de garde (#171)', () => {
|
||||||
let service: AssistantesMaternellesService;
|
let service: AssistantesMaternellesService;
|
||||||
|
|
||||||
beforeEach(async () => {
|
const amRepo = { findOne: jest.fn(), update: jest.fn() };
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const usersRepo = {};
|
||||||
providers: [AssistantesMaternellesService],
|
const amChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
}).compile();
|
const childrenRepo = {};
|
||||||
|
const parentsChildrenRepo = { find: jest.fn() };
|
||||||
|
|
||||||
service = module.get<AssistantesMaternellesService>(AssistantesMaternellesService);
|
beforeEach(async () => {
|
||||||
|
jest.clearAllMocks();
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
AssistantesMaternellesService,
|
||||||
|
{ provide: getRepositoryToken(AssistanteMaternelle), useValue: amRepo },
|
||||||
|
{ provide: getRepositoryToken(Users), useValue: usersRepo },
|
||||||
|
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||||
|
{ provide: getRepositoryToken(Children), useValue: childrenRepo },
|
||||||
|
{
|
||||||
|
provide: getRepositoryToken(ParentsChildren),
|
||||||
|
useValue: parentsChildrenRepo,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
service = module.get(AssistantesMaternellesService);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should be defined', () => {
|
it('should be defined', () => {
|
||||||
expect(service).toBeDefined();
|
expect(service).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('listerCouplesGarde', () => {
|
||||||
|
it('retourne vide si aucun placement', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({
|
||||||
|
user_id: 'am-1',
|
||||||
|
id_placement_garde_courant: null,
|
||||||
|
});
|
||||||
|
amChildrenRepo.find.mockResolvedValue([]);
|
||||||
|
const res = await service.listerCouplesGarde('am-1');
|
||||||
|
expect(res).toEqual({ couples: [], couple_courant_id: null });
|
||||||
|
expect(parentsChildrenRepo.find).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('mappe placements + parents et marque le courant', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({
|
||||||
|
user_id: 'am-1',
|
||||||
|
id_placement_garde_courant: 'pl-2',
|
||||||
|
});
|
||||||
|
amChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
id: 'pl-1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
child: { id: 'e1', first_name: 'Léa', last_name: 'M', photo_url: null },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'pl-2',
|
||||||
|
enfantId: 'e2',
|
||||||
|
child: { id: 'e2', first_name: 'Emma', last_name: 'M', photo_url: null },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
parentsChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
parentId: 'p1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
parentId: 'p2',
|
||||||
|
enfantId: 'e1',
|
||||||
|
parent: { user: { prenom: 'Thomas', nom: 'Martin', photo_url: null } },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
parentId: 'p1',
|
||||||
|
enfantId: 'e2',
|
||||||
|
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const res = await service.listerCouplesGarde('am-1');
|
||||||
|
expect(res.couples).toHaveLength(2);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-2');
|
||||||
|
expect(res.couples[1].courant).toBe(true);
|
||||||
|
expect(res.couples[0].parents).toHaveLength(2);
|
||||||
|
expect(res.couples[0].parents[0].prenom).toBe('Claire');
|
||||||
|
expect(res.couples[0].enfant.prenom).toBe('Léa');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('404 si AM inconnue', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue(null);
|
||||||
|
await expect(service.listerCouplesGarde('x')).rejects.toBeInstanceOf(
|
||||||
|
NotFoundException,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('definirCoupleGardeCourant', () => {
|
||||||
|
it('persiste si le placement appartient à l’AM', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({
|
||||||
|
user_id: 'am-1',
|
||||||
|
id_placement_garde_courant: null,
|
||||||
|
});
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
});
|
||||||
|
amRepo.update.mockResolvedValue({ affected: 1 });
|
||||||
|
amChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
id: 'pl-1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
child: { id: 'e1', first_name: 'Léa', last_name: null, photo_url: null },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
parentsChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
parentId: 'p1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
parent: { user: { prenom: 'Claire', nom: 'M', photo_url: null } },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const res = await service.definirCoupleGardeCourant('am-1', 'pl-1');
|
||||||
|
expect(amRepo.update).toHaveBeenCalledWith(
|
||||||
|
{ user_id: 'am-1' },
|
||||||
|
{ id_placement_garde_courant: 'pl-1' },
|
||||||
|
);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-1');
|
||||||
|
expect(res.couples[0].courant).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('404 si placement d’une autre AM', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({ user_id: 'am-1' });
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue(null);
|
||||||
|
await expect(
|
||||||
|
service.definirCoupleGardeCourant('am-1', 'pl-x'),
|
||||||
|
).rejects.toBeInstanceOf(NotFoundException);
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,14 +5,16 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { IsNull, Repository } from 'typeorm';
|
import { In, IsNull, Repository } from 'typeorm';
|
||||||
import { RoleType, Users } from 'src/entities/users.entity';
|
import { RoleType, Users } from 'src/entities/users.entity';
|
||||||
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { Children, StatutEnfantType } from 'src/entities/children.entity';
|
import { Children, StatutEnfantType } from 'src/entities/children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { CreateAssistanteDto } from '../user/dto/create_assistante.dto';
|
import { CreateAssistanteDto } from '../user/dto/create_assistante.dto';
|
||||||
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
||||||
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
||||||
|
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
|
||||||
import { validateNir } from 'src/common/utils/nir.util';
|
import { validateNir } from 'src/common/utils/nir.util';
|
||||||
|
|
||||||
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
|
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
|
||||||
@@ -28,6 +30,8 @@ export class AssistantesMaternellesService {
|
|||||||
private readonly amChildrenRepository: Repository<AmChildren>,
|
private readonly amChildrenRepository: Repository<AmChildren>,
|
||||||
@InjectRepository(Children)
|
@InjectRepository(Children)
|
||||||
private readonly childrenRepository: Repository<Children>,
|
private readonly childrenRepository: Repository<Children>,
|
||||||
|
@InjectRepository(ParentsChildren)
|
||||||
|
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
|
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
|
||||||
@@ -264,4 +268,107 @@ export class AssistantesMaternellesService {
|
|||||||
await this.assistantesMaternelleRepository.delete(id);
|
await this.assistantesMaternelleRepository.delete(id);
|
||||||
return { message: 'Assistante maternelle supprimée' };
|
return { message: 'Assistante maternelle supprimée' };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liste les couples de garde (enfant ↔ parents) de l’AM connectée — ticket #171.
|
||||||
|
* Un couple = un placement actif dans enfants_assistantes_maternelles pour cette AM.
|
||||||
|
*/
|
||||||
|
async listerCouplesGarde(amUserId: string): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
const am = await this.assistantesMaternelleRepository.findOne({
|
||||||
|
where: { user_id: amUserId },
|
||||||
|
});
|
||||||
|
if (!am) {
|
||||||
|
throw new NotFoundException('Assistante maternelle introuvable');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placements = await this.amChildrenRepository.find({
|
||||||
|
where: { amId: amUserId, date_fin: IsNull() },
|
||||||
|
relations: ['child'],
|
||||||
|
order: { date_debut: 'ASC' },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (placements.length === 0) {
|
||||||
|
return { couples: [], couple_courant_id: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
const enfantIds = placements.map((p) => p.enfantId);
|
||||||
|
const liens = await this.parentsChildrenRepository.find({
|
||||||
|
where: { enfantId: In(enfantIds) },
|
||||||
|
relations: ['parent', 'parent.user'],
|
||||||
|
});
|
||||||
|
const parentsByEnfant = new Map<
|
||||||
|
string,
|
||||||
|
{ id: string; prenom: string | null; nom: string | null; photo_url: string | null }[]
|
||||||
|
>();
|
||||||
|
for (const l of liens) {
|
||||||
|
const list = parentsByEnfant.get(l.enfantId) ?? [];
|
||||||
|
const u = l.parent?.user;
|
||||||
|
list.push({
|
||||||
|
id: l.parentId,
|
||||||
|
prenom: u?.prenom ?? null,
|
||||||
|
nom: u?.nom ?? null,
|
||||||
|
photo_url: u?.photo_url ?? null,
|
||||||
|
});
|
||||||
|
parentsByEnfant.set(l.enfantId, list);
|
||||||
|
}
|
||||||
|
|
||||||
|
let idCourant = am.id_placement_garde_courant ?? null;
|
||||||
|
const idsValides = new Set(placements.map((p) => p.id));
|
||||||
|
if (idCourant && !idsValides.has(idCourant)) {
|
||||||
|
idCourant = null;
|
||||||
|
await this.assistantesMaternelleRepository.update(
|
||||||
|
{ user_id: amUserId },
|
||||||
|
{ id_placement_garde_courant: () => 'NULL' },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!idCourant && placements.length === 1) {
|
||||||
|
idCourant = placements[0].id;
|
||||||
|
}
|
||||||
|
|
||||||
|
const couples = placements.map((p) => ({
|
||||||
|
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,
|
||||||
|
},
|
||||||
|
parents: parentsByEnfant.get(p.enfantId) ?? [],
|
||||||
|
courant: idCourant != null && p.id === idCourant,
|
||||||
|
}));
|
||||||
|
|
||||||
|
return {
|
||||||
|
couples,
|
||||||
|
couple_courant_id: idCourant,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persiste le couple de garde actif pour l’AM — ticket #171.
|
||||||
|
*/
|
||||||
|
async definirCoupleGardeCourant(
|
||||||
|
amUserId: string,
|
||||||
|
coupleId: string,
|
||||||
|
): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
const am = await this.assistantesMaternelleRepository.findOne({
|
||||||
|
where: { user_id: amUserId },
|
||||||
|
});
|
||||||
|
if (!am) {
|
||||||
|
throw new NotFoundException('Assistante maternelle introuvable');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placement = await this.amChildrenRepository.findOne({
|
||||||
|
where: { id: coupleId, amId: amUserId, date_fin: IsNull() },
|
||||||
|
});
|
||||||
|
if (!placement) {
|
||||||
|
throw new NotFoundException('Couple de garde introuvable ou inactif pour cette AM');
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.assistantesMaternelleRepository.update(
|
||||||
|
{ user_id: amUserId },
|
||||||
|
{ id_placement_garde_courant: coupleId },
|
||||||
|
);
|
||||||
|
|
||||||
|
return this.listerCouplesGarde(amUserId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
/** Identité minimale enfant — ticket #171 (miroir #168) */
|
||||||
|
export class CoupleGardeAmEnfantDto {
|
||||||
|
@ApiProperty({ format: 'uuid' })
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
prenom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
nom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
photo_url?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Identité minimale parent pour bandeau AM — ticket #171 */
|
||||||
|
export class CoupleGardeAmParentDto {
|
||||||
|
@ApiProperty({ format: 'uuid', description: 'UUID utilisateur du parent' })
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
prenom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
nom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
photo_url?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Un couple côté AM = placement actif enfant ↔ foyer parents.
|
||||||
|
* `id` = enfants_assistantes_maternelles.id (même clé que #168).
|
||||||
|
*/
|
||||||
|
export class CoupleGardeAmDto {
|
||||||
|
@ApiProperty({
|
||||||
|
format: 'uuid',
|
||||||
|
description: 'Id du placement (enfants_assistantes_maternelles.id)',
|
||||||
|
})
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiProperty({ type: CoupleGardeAmEnfantDto })
|
||||||
|
enfant: CoupleGardeAmEnfantDto;
|
||||||
|
|
||||||
|
@ApiProperty({
|
||||||
|
type: [CoupleGardeAmParentDto],
|
||||||
|
description: 'Parents rattachés à l’enfant (0–2 typiquement)',
|
||||||
|
})
|
||||||
|
parents: CoupleGardeAmParentDto[];
|
||||||
|
|
||||||
|
@ApiProperty({ description: 'True si c’est le couple actuellement sélectionné' })
|
||||||
|
courant: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CouplesGardeAmResponseDto {
|
||||||
|
@ApiProperty({ type: [CoupleGardeAmDto] })
|
||||||
|
couples: CoupleGardeAmDto[];
|
||||||
|
|
||||||
|
@ApiPropertyOptional({
|
||||||
|
format: 'uuid',
|
||||||
|
nullable: true,
|
||||||
|
description: 'Id du couple courant (null si aucun)',
|
||||||
|
})
|
||||||
|
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 AM — ticket #171 */
|
||||||
|
export class DefinirCoupleGardeCourantAmDto {
|
||||||
|
@ApiProperty({
|
||||||
|
format: 'uuid',
|
||||||
|
description: 'Id du placement (enfants_assistantes_maternelles.id) à sélectionner',
|
||||||
|
})
|
||||||
|
@IsUUID()
|
||||||
|
@IsNotEmpty()
|
||||||
|
couple_id: string;
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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');
|
||||||
@@ -141,7 +143,10 @@ CREATE TABLE assistantes_maternelles (
|
|||||||
annee_experience SMALLINT,
|
annee_experience SMALLINT,
|
||||||
specialite VARCHAR(100),
|
specialite VARCHAR(100),
|
||||||
place_disponible INT,
|
place_disponible INT,
|
||||||
numero_dossier VARCHAR(20)
|
numero_dossier VARCHAR(20),
|
||||||
|
-- Préférence couple de garde actif (TdB quotidien AM) — ticket #171
|
||||||
|
-- FK ajoutée après création de enfants_assistantes_maternelles (voir ALTER plus bas)
|
||||||
|
id_placement_garde_courant UUID
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE INDEX idx_assistantes_maternelles_numero_dossier
|
CREATE INDEX idx_assistantes_maternelles_numero_dossier
|
||||||
@@ -154,7 +159,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 +214,26 @@ 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;
|
||||||
|
|
||||||
|
-- FK couple courant AM → placement (#171)
|
||||||
|
ALTER TABLE assistantes_maternelles
|
||||||
|
ADD CONSTRAINT fk_am_placement_garde_courant
|
||||||
|
FOREIGN KEY (id_placement_garde_courant)
|
||||||
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
CREATE INDEX idx_am_placement_garde_courant
|
||||||
|
ON assistantes_maternelles(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 +322,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
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
|
|||||||
@@ -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 #171 — Couple de garde courant (préférence AM)
|
||||||
|
-- Idempotent : safe à rejouer.
|
||||||
|
|
||||||
|
ALTER TABLE assistantes_maternelles
|
||||||
|
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_am_placement_garde_courant
|
||||||
|
ON assistantes_maternelles(id_placement_garde_courant)
|
||||||
|
WHERE id_placement_garde_courant IS NOT NULL;
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
-- Ticket #194 — Module Cartes SYSTEM (collecte absences/congés/arrêt)
|
||||||
|
-- Idempotent.
|
||||||
|
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_response_mode_type') THEN
|
||||||
|
CREATE TYPE card_response_mode_type AS ENUM (
|
||||||
|
'none', 'ack', 'accept_refuse'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_instance_statut_type') THEN
|
||||||
|
CREATE TYPE card_instance_statut_type AS ENUM (
|
||||||
|
'ouverte', 'refusee', 'traitee'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_operation_type') THEN
|
||||||
|
CREATE TYPE card_operation_type AS ENUM ('create', 'update');
|
||||||
|
END IF;
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_response_action_type') THEN
|
||||||
|
CREATE TYPE card_response_action_type AS ENUM (
|
||||||
|
'accept', 'refuse', 'ack'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_types (
|
||||||
|
code VARCHAR(64) PRIMARY KEY,
|
||||||
|
system BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
titre VARCHAR(120) NOT NULL,
|
||||||
|
emitter_roles TEXT[] NOT NULL,
|
||||||
|
recipient_roles TEXT[] NOT NULL,
|
||||||
|
audience_resolver VARCHAR(64) NOT NULL,
|
||||||
|
response_mode card_response_mode_type NOT NULL,
|
||||||
|
retention_days INT NOT NULL DEFAULT 14,
|
||||||
|
couleur VARCHAR(32),
|
||||||
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_instances (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
type_code VARCHAR(64) NOT NULL REFERENCES card_types(code),
|
||||||
|
id_placement UUID NOT NULL
|
||||||
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||||
|
id_absence UUID REFERENCES absences_garde(id) ON DELETE SET NULL,
|
||||||
|
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||||
|
operation card_operation_type NOT NULL DEFAULT 'create',
|
||||||
|
statut card_instance_statut_type NOT NULL DEFAULT 'ouverte',
|
||||||
|
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
purge_at TIMESTAMPTZ NOT NULL,
|
||||||
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_instances_placement
|
||||||
|
ON card_instances (id_placement, statut, cree_le DESC);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_instances_purge
|
||||||
|
ON card_instances (purge_at);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_instances_absence
|
||||||
|
ON card_instances (id_absence)
|
||||||
|
WHERE id_absence IS NOT NULL;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_audience_members (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
id_card UUID NOT NULL REFERENCES card_instances(id) ON DELETE CASCADE,
|
||||||
|
id_utilisateur UUID NOT NULL REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
||||||
|
role_snapshot VARCHAR(64) NOT NULL,
|
||||||
|
is_creator BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
UNIQUE (id_card, id_utilisateur)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_audience_user
|
||||||
|
ON card_audience_members (id_utilisateur, id_card);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_responses (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
id_card UUID NOT NULL REFERENCES card_instances(id) ON DELETE CASCADE,
|
||||||
|
id_utilisateur UUID NOT NULL REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
||||||
|
action card_response_action_type NOT NULL,
|
||||||
|
comment TEXT,
|
||||||
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_responses_card
|
||||||
|
ON card_responses (id_card, cree_le DESC);
|
||||||
|
|
||||||
|
-- Seeds SYSTEM
|
||||||
|
INSERT INTO card_types (
|
||||||
|
code, system, titre, emitter_roles, recipient_roles,
|
||||||
|
audience_resolver, response_mode, retention_days, couleur
|
||||||
|
) VALUES
|
||||||
|
(
|
||||||
|
'absence_enfant', true, 'Absence enfant',
|
||||||
|
ARRAY['parent'], ARRAY['assistante_maternelle'],
|
||||||
|
'couple_am', 'none', 7, 'peach'
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'absence_enfant_modif', true, 'Absence enfant modifiée',
|
||||||
|
ARRAY['parent'], ARRAY['assistante_maternelle'],
|
||||||
|
'couple_am', 'ack', 7, 'peach'
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'conge_am', true, 'Congé AM',
|
||||||
|
ARRAY['assistante_maternelle'], ARRAY['parent'],
|
||||||
|
'couple_parents', 'accept_refuse', 14, 'lavender'
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'arret_maladie_am', true, 'Arrêt maladie AM',
|
||||||
|
ARRAY['assistante_maternelle'], ARRAY['parent'],
|
||||||
|
'couple_parents', 'ack', 14, 'pink'
|
||||||
|
)
|
||||||
|
ON CONFLICT (code) DO UPDATE SET
|
||||||
|
titre = EXCLUDED.titre,
|
||||||
|
emitter_roles = EXCLUDED.emitter_roles,
|
||||||
|
recipient_roles = EXCLUDED.recipient_roles,
|
||||||
|
audience_resolver = EXCLUDED.audience_resolver,
|
||||||
|
response_mode = EXCLUDED.response_mode,
|
||||||
|
retention_days = EXCLUDED.retention_days,
|
||||||
|
couleur = EXCLUDED.couleur,
|
||||||
|
modifie_le = now();
|
||||||
|
|
||||||
|
COMMENT ON TABLE card_types IS 'Catalogue types de cartes (SYSTEM seeds #194 ; OPTIONNEL plus tard).';
|
||||||
|
COMMENT ON TABLE card_instances IS 'Bulles / file d’attention — collecte, pas vérité métier absences.';
|
||||||
@@ -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;
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ Index de navigation du dépôt. Dernière révision : **septembre 2026** (CDC V1
|
|||||||
| [12 — SRS gestion utilisateurs](./12_SRS-GESTION-UTILISATEURS.md) | Spécification **technique** du domaine users / dossiers |
|
| [12 — SRS gestion utilisateurs](./12_SRS-GESTION-UTILISATEURS.md) | Spécification **technique** du domaine users / dossiers |
|
||||||
| [05 — Versions & milestones](./05_VERSIONS-ET-MILESTONES.md) | Semver Gitea + bilans |
|
| [05 — Versions & milestones](./05_VERSIONS-ET-MILESTONES.md) | Semver Gitea + bilans |
|
||||||
| [29 — Bilan version 0.1.0](./29_BILAN-VERSION-0.1.0.md) | Tickets livrés 0.1.0 |
|
| [29 — Bilan version 0.1.0](./29_BILAN-VERSION-0.1.0.md) | Tickets livrés 0.1.0 |
|
||||||
|
| [30 — Découpage tickets quotidien](./30_DECOUPAGE-TICKETS-QUOTIDIEN.md) | Brouillon / backlog tickets parent/AM |
|
||||||
|
| [31 — Mini-spec quotidien parent/AM](./31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md) | Besoin figé atelier sept. 2026 |
|
||||||
| [04 — Roadmap générale](./04_ROADMAP-GENERALE.md) | Vision phases long terme |
|
| [04 — Roadmap générale](./04_ROADMAP-GENERALE.md) | Vision phases long terme |
|
||||||
| [28 — Évolution famille / responsables](./28_EVOLUTION-FAMILLE-ET-RESPONSABLES.md) | Limites modèle foyer / contournements |
|
| [28 — Évolution famille / responsables](./28_EVOLUTION-FAMILLE-ET-RESPONSABLES.md) | Limites modèle foyer / contournements |
|
||||||
|
|
||||||
@@ -30,7 +32,13 @@ Index de navigation du dépôt. Dernière révision : **septembre 2026** (CDC V1
|
|||||||
|-----|---------|
|
|-----|---------|
|
||||||
| [20 — Workflow création de compte](./20_WORKFLOW-CREATION-COMPTE.md) | Inscription / validation (détail historique) |
|
| [20 — Workflow création de compte](./20_WORKFLOW-CREATION-COMPTE.md) | Inscription / validation (détail historique) |
|
||||||
| [juridique/](./juridique/README.md) | CGU / CGC / privacy + [22 technique](./juridique/22_DOCUMENTS-LEGAUX.md) |
|
| [juridique/](./juridique/README.md) | CGU / CGC / privacy + [22 technique](./juridique/22_DOCUMENTS-LEGAUX.md) |
|
||||||
|
|
||||||
|
## Charte & maquettes
|
||||||
|
|
||||||
|
| Doc | Contenu |
|
||||||
|
|-----|---------|
|
||||||
| [CHARTE_GRAPHIQUE.md](./CHARTE_GRAPHIQUE.md) | Charte UI |
|
| [CHARTE_GRAPHIQUE.md](./CHARTE_GRAPHIQUE.md) | Charte UI |
|
||||||
|
| [maquettes/](./maquettes/README.md) | Maquettes TdB quotidien (réf. v4 + historique) |
|
||||||
|
|
||||||
## Projet & outillage
|
## Projet & outillage
|
||||||
|
|
||||||
|
|||||||
@@ -12,12 +12,12 @@ Ce fichier remplace, pour le **semver / milestones**, les anciennes tables figé
|
|||||||
| Milestone | Rôle | Statut |
|
| Milestone | Rôle | Statut |
|
||||||
|-----------|------|--------|
|
|-----------|------|--------|
|
||||||
| **0.1.0** | MVP opérable (auth, inscription, dashboard dossiers/fiches, suppressions, cleanups) | **Terminée** — [bilan](./29_BILAN-VERSION-0.1.0.md) |
|
| **0.1.0** | MVP opérable (auth, inscription, dashboard dossiers/fiches, suppressions, cleanups) | **Terminée** — [bilan](./29_BILAN-VERSION-0.1.0.md) |
|
||||||
| **0.2.0** | Suite produit (ex. recherche / échanges — sans contrat) | Ouverte |
|
| **0.2.0** | **Quotidien parent / AM** (TdB 3 colonnes, cartes, blog, messagerie) — [#165](https://git.ptits-pas.fr/jmartin/petitspas/issues/165)… | **Ouverte** — [mini-spec](./31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md) · [découpage](./30_DECOUPAGE-TICKETS-QUOTIDIEN.md) |
|
||||||
| **0.3.0** | Contrat + planning | Ouverte |
|
| **0.3.0** | Contrat + planning | Fermée (vide) — à réouvrir au besoin |
|
||||||
| **0.4.0** | Carnet de liaison | Ouverte |
|
| **0.4.0** | Carnet de liaison | Fermée (vide) — à réouvrir au besoin |
|
||||||
| **0.9.0** | Hors périmètre cleanup 0.1.0 (doublons, upload, tech auth/photos, UX erreurs…) | Ouverte |
|
| **0.9.0** | Hors périmètre cleanup 0.1.0 | Fermée (vide) |
|
||||||
| **1.0.0** | Release majeure Phase 1 (critères PO) | Réserve |
|
| **1.0.0** | Release majeure (critères PO) | Fermée (réserve) |
|
||||||
| **Backlog transverse** | Doc étendue, CI/tests, RGPD avancé, monitoring — hors semver dédié | Ouverte |
|
| **Backlog transverse** | Doc / CI / RGPD / monitoring | Fermée (vide) |
|
||||||
|
|
||||||
Liens Gitea : [milestones](https://git.ptits-pas.fr/jmartin/petitspas/milestones).
|
Liens Gitea : [milestones](https://git.ptits-pas.fr/jmartin/petitspas/milestones).
|
||||||
|
|
||||||
@@ -35,6 +35,8 @@ Liens Gitea : [milestones](https://git.ptits-pas.fr/jmartin/petitspas/milestones
|
|||||||
|-----|------|
|
|-----|------|
|
||||||
| [01_CAHIER-DES-CHARGES.md](./01_CAHIER-DES-CHARGES.md) | CDC **complet** V1.4 (users mis à jour ; reste = cible) |
|
| [01_CAHIER-DES-CHARGES.md](./01_CAHIER-DES-CHARGES.md) | CDC **complet** V1.4 (users mis à jour ; reste = cible) |
|
||||||
| [12_SRS-GESTION-UTILISATEURS.md](./12_SRS-GESTION-UTILISATEURS.md) | SRS technique domaine utilisateurs |
|
| [12_SRS-GESTION-UTILISATEURS.md](./12_SRS-GESTION-UTILISATEURS.md) | SRS technique domaine utilisateurs |
|
||||||
|
| [31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md](./31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md) | Besoin quotidien parent/AM (0.2.0) |
|
||||||
|
| [30_DECOUPAGE-TICKETS-QUOTIDIEN.md](./30_DECOUPAGE-TICKETS-QUOTIDIEN.md) | Mapping tickets #165–#189 |
|
||||||
| Archive CDC V1.3 | [archive/obsolete/01_CAHIER-DES-CHARGES-v1.3.md](./archive/obsolete/01_CAHIER-DES-CHARGES-v1.3.md) |
|
| Archive CDC V1.3 | [archive/obsolete/01_CAHIER-DES-CHARGES-v1.3.md](./archive/obsolete/01_CAHIER-DES-CHARGES-v1.3.md) |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -8,5 +8,7 @@ Ne plus maintenir de catalogue exhaustif des tickets dans le dépôt : l’état
|
|||||||
|
|
||||||
Pour une **version livrée**, lire le bilan correspondant (ex. [29_BILAN-VERSION-0.1.0.md](./29_BILAN-VERSION-0.1.0.md)).
|
Pour une **version livrée**, lire le bilan correspondant (ex. [29_BILAN-VERSION-0.1.0.md](./29_BILAN-VERSION-0.1.0.md)).
|
||||||
|
|
||||||
|
**Backlog en cours `0.2.0` (quotidien)** : epic [#165](https://git.ptits-pas.fr/jmartin/petitspas/issues/165) · [découpage #166–#189](./30_DECOUPAGE-TICKETS-QUOTIDIEN.md) · [mini-spec](./31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md).
|
||||||
|
|
||||||
Archive historique (liste Phase 1 figée, avril 2026) :
|
Archive historique (liste Phase 1 figée, avril 2026) :
|
||||||
[archive/obsolete/23_LISTE-TICKETS.md](./archive/obsolete/23_LISTE-TICKETS.md).
|
[archive/obsolete/23_LISTE-TICKETS.md](./archive/obsolete/23_LISTE-TICKETS.md).
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# 📋 Décisions Projet - P'titsPas
|
# 📋 Décisions Projet - P'titsPas
|
||||||
|
|
||||||
**Version** : 1.2
|
**Version** : 1.4
|
||||||
**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"}
|
||||||
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -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
|
## 📋 Résumé des décisions critiques
|
||||||
|
|
||||||
| # | Décision | Statut | Impact |
|
| # | Décision | Statut | Impact |
|
||||||
@@ -575,6 +603,7 @@ docs/
|
|||||||
| 14 | Migration données | ❌ Rejeté | N/A |
|
| 14 | Migration données | ❌ Rejeté | N/A |
|
||||||
| 15 | Doc utilisateur | ⏸️ Phase 2 | Formation |
|
| 15 | Doc utilisateur | ⏸️ Phase 2 | Formation |
|
||||||
| 31 | Logs Winston | ✅ Phase 1 | Monitoring |
|
| 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 |
|
| 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 |
|
| 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 |
|
| 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.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
|
**Dernière mise à jour** : 24 Septembre 2026
|
||||||
**Version** : 1.2
|
**Version** : 1.4
|
||||||
**Statut** : ✅ Document validé
|
**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 .
|
"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"
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -0,0 +1,212 @@
|
|||||||
|
# Découpage tickets — Quotidien parent / AM
|
||||||
|
|
||||||
|
> **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)
|
||||||
|
> **Décision :** [24_DECISIONS-PROJET.md](./24_DECISIONS-PROJET.md) §32 (Cartes ≠ back Absences).
|
||||||
|
|
||||||
|
## Intention produit (rappel)
|
||||||
|
|
||||||
|
- TdB PC en **3 colonnes** : **cartes** | **blog** (défaut) | **messagerie**
|
||||||
|
- Contexte actif = **couple** enfant–nounou (parent) / enfant–parent(s) (AM)
|
||||||
|
- Blog **indispensable** (AM + RPE) ; messagerie type WhatsApp (BABA, 2 parents = même fil AM)
|
||||||
|
- Look **papier / pastel / lignée inscription** (pas le dashboard staff)
|
||||||
|
- **Widgets partagés** parent ↔ AM (blog, messagerie, cartes, coquille, couple paramétré) — pas de double implémentation
|
||||||
|
- « Effet démo » = logiciel peuplé + sync live multi-écrans — **pas** un sous-MVP jetable
|
||||||
|
- **Hors ce découpage** (jalons suivants) : page Contrat riche (Pajemploi, CP), notifs CDC fourre-tout, masquage messages, posts blog parent, Agenda « riche » (entrée bandeau possible en stub)
|
||||||
|
|
||||||
|
## Contrainte technique front (dictée 23/09)
|
||||||
|
|
||||||
|
Les panneaux parent et AM étant **quasiment identiques**, le découpage impose des **briques réutilisables** :
|
||||||
|
|
||||||
|
| Widget / module | Tickets concernés |
|
||||||
|
|-----------------|-------------------|
|
||||||
|
| Coquille TdB 3 colonnes + bandeau | A1, B1 — B1 **réutilise** la coquille d’A1 |
|
||||||
|
| Sélecteur couple (mode parent vs AM) | A2, B2 — **un** composant, 2 modes |
|
||||||
|
| Flux de cartes | C2, C3 — **un** widget + config rôles |
|
||||||
|
| Blog (fil + composeur) | D2, D3, D4 — même brique |
|
||||||
|
| Messagerie (chat + onglets) | E4, E5, E6 — même brique |
|
||||||
|
|
||||||
|
Les tickets **[Front] AM** (B1, B2, C3, D3, E5) = **intégration / mode rôle**, pas une 2ᵉ copie du code.
|
||||||
|
|
||||||
|
|
||||||
|
## Proposition de milestone
|
||||||
|
|
||||||
|
| Champ | Valeur |
|
||||||
|
|-------|--------|
|
||||||
|
| Titre | **`0.2.0`** (rouvert) |
|
||||||
|
| Description | Quotidien parent / AM — TdB 3 colonnes, cartes, blog, messagerie |
|
||||||
|
| Label | `v0.2.0` |
|
||||||
|
|
||||||
|
## Mapping Gitea
|
||||||
|
|
||||||
|
| Id | Issue | Titre |
|
||||||
|
|----|-------|-------|
|
||||||
|
| Epic | [#165](https://git.ptits-pas.fr/jmartin/petitspas/issues/165) | Epic quotidien |
|
||||||
|
| A1 | [#166](https://git.ptits-pas.fr/jmartin/petitspas/issues/166) | [Front] Coquille TdB parent |
|
||||||
|
| A2 | [#167](https://git.ptits-pas.fr/jmartin/petitspas/issues/167) | [Front] Couple enfant–nounou |
|
||||||
|
| A3 | [#168](https://git.ptits-pas.fr/jmartin/petitspas/issues/168) | [Backend] API couples parent |
|
||||||
|
| B1 | [#169](https://git.ptits-pas.fr/jmartin/petitspas/issues/169) | [Front] Coquille TdB AM |
|
||||||
|
| B2 | [#170](https://git.ptits-pas.fr/jmartin/petitspas/issues/170) | [Front] Couple enfant–parent(s) |
|
||||||
|
| B3 | [#171](https://git.ptits-pas.fr/jmartin/petitspas/issues/171) | [Backend] API enfants AM |
|
||||||
|
| C1 | [#172](https://git.ptits-pas.fr/jmartin/petitspas/issues/172) | [Backend] API cartes |
|
||||||
|
| C2 | [#173](https://git.ptits-pas.fr/jmartin/petitspas/issues/173) | [Front] Cartes parent |
|
||||||
|
| C3 | [#174](https://git.ptits-pas.fr/jmartin/petitspas/issues/174) | [Front] Cartes AM |
|
||||||
|
| C4 | [#175](https://git.ptits-pas.fr/jmartin/petitspas/issues/175) | [Front] Déclarer absence |
|
||||||
|
| C5 | [#176](https://git.ptits-pas.fr/jmartin/petitspas/issues/176) | [Front] Formulaires AM cartes |
|
||||||
|
| D1 | [#177](https://git.ptits-pas.fr/jmartin/petitspas/issues/177) | [Backend] API blog |
|
||||||
|
| D2 | [#178](https://git.ptits-pas.fr/jmartin/petitspas/issues/178) | [Front] Blog parent |
|
||||||
|
| D3 | [#179](https://git.ptits-pas.fr/jmartin/petitspas/issues/179) | [Front] Blog AM |
|
||||||
|
| D4 | [#180](https://git.ptits-pas.fr/jmartin/petitspas/issues/180) | [Front] Blog gestionnaire |
|
||||||
|
| E1 | [#181](https://git.ptits-pas.fr/jmartin/petitspas/issues/181) | [Backend] Socle messagerie |
|
||||||
|
| E2 | [#182](https://git.ptits-pas.fr/jmartin/petitspas/issues/182) | [Backend] Mess. AM |
|
||||||
|
| E3 | [#183](https://git.ptits-pas.fr/jmartin/petitspas/issues/183) | [Backend] Mess. RPE |
|
||||||
|
| E4 | [#184](https://git.ptits-pas.fr/jmartin/petitspas/issues/184) | [Front] Messagerie parent |
|
||||||
|
| E5 | [#185](https://git.ptits-pas.fr/jmartin/petitspas/issues/185) | [Front] Messagerie AM |
|
||||||
|
| E6 | [#186](https://git.ptits-pas.fr/jmartin/petitspas/issues/186) | [Front] Mess. RPE gestionnaire |
|
||||||
|
| F1 | [#187](https://git.ptits-pas.fr/jmartin/petitspas/issues/187) | [Front] Stubs Agenda / Contrat |
|
||||||
|
| F2 | [#188](https://git.ptits-pas.fr/jmartin/petitspas/issues/188) | [Front] Swipe mobile |
|
||||||
|
| G1 | [#189](https://git.ptits-pas.fr/jmartin/petitspas/issues/189) | [Backend] Seeds quotidien |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Epic A — Coquille TdB parent
|
||||||
|
|
||||||
|
### A1 — [Front] Coquille TdB parent 3 colonnes + bandeau → [#166](https://git.ptits-pas.fr/jmartin/petitspas/issues/166)
|
||||||
|
Bandeau TdB / Agenda / Contrat + menu user ; corps en 3 colonnes (cartes | blog | messagerie) ; fond papier / pastel. **Livrer la coquille comme widget/layout réutilisable** (l’AM B1 s’en branche). Remplace / refactor `ParentDashboardScreen` + `dashbord_parent/`.
|
||||||
|
|
||||||
|
### A2 — [Front] Sélecteur couple enfant–nounou → [#167](https://git.ptits-pas.fr/jmartin/petitspas/issues/167)
|
||||||
|
Composant **paramétrable** (mode parent : enfant|nounou). Dropdown si plusieurs gardes ; informatif si une seule. B2 = même widget en mode AM.
|
||||||
|
|
||||||
|
### A3 — [Back] API contexte de garde actif (couples parent)
|
||||||
|
Endpoint(s) listant les couples enfant–AM du parent connecté + couple « courant » (persistance session / préférence). Données mini : ids, noms, photos.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Epic B — Coquille TdB AM (miroir)
|
||||||
|
|
||||||
|
### B1 — [Front] Coquille TdB AM 3 colonnes + bandeau → [#169](https://git.ptits-pas.fr/jmartin/petitspas/issues/169)
|
||||||
|
**Réutilise** la coquille d’A1/#166 ; point de départ `am_dashboard_screen.dart`.
|
||||||
|
|
||||||
|
### B2 — [Front] Sélecteur couple enfant–parent(s) → [#170](https://git.ptits-pas.fr/jmartin/petitspas/issues/170)
|
||||||
|
**Même widget** qu’A2 en mode AM : gauche photo enfant ; droite parent1+parent2 empilés ou un parent centré.
|
||||||
|
|
||||||
|
### B3 — [Back] API contexte enfants accueillis (AM)
|
||||||
|
Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Epic C — Absences + Cartes (file d’attention)
|
||||||
|
|
||||||
|
**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.
|
||||||
|
|
||||||
|
### Back (ordre)
|
||||||
|
|
||||||
|
| É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 → **SSE** `GET /cards/stream` (#195) |
|
||||||
|
| Purge TTL | Job `expire_at` / `purge_at` |
|
||||||
|
|
||||||
|
### Front (après API — hors chantier back immédiat)
|
||||||
|
|
||||||
|
| 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).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Epic D — Blog
|
||||||
|
|
||||||
|
### D1 — [Back] Modèle + API blog (posts + médias)
|
||||||
|
Posts par auteur AM ou gestionnaire (RPE) ; texte + photos ; ciblage enfants (AM) / audience (RPE) ; fil visible parents (et AM selon règles). Sync temps réel ou polling acceptable V1.
|
||||||
|
|
||||||
|
### D2 — [Front] Colonne Blog parent (défaut)
|
||||||
|
Fil de posts ; auteur **distinct** AM vs RPE ; miniatures ; pas de bouton « Écrire un post » parent en V1 (reporté).
|
||||||
|
|
||||||
|
### D3 — [Front] Colonne Blog AM — lecture + écrire un post
|
||||||
|
Composer texte + photos + sélection enfants concernés ; publication.
|
||||||
|
|
||||||
|
### D4 — [Front] Publication blog gestionnaire (point d’entrée staff)
|
||||||
|
UI minimale côté dashboard gestionnaire (ou réutilisation) pour publier une annonce RPE visible sur les TdB parent/AM.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Epic E — Messagerie
|
||||||
|
|
||||||
|
### E1 — [Back] Socle messagerie (choix lib / protocole) + API
|
||||||
|
Évaluer brique existante (style chat WhatsApp : texte, emoji, images). Conversations, participants, pièces jointes images. Temps réel (WS ou équivalent) souhaité pour l’effet multi-écrans.
|
||||||
|
|
||||||
|
### E2 — [Back] Mess. AM — conversation foyer ↔ AM
|
||||||
|
Une conversation par couple/foyer ; **les deux parents** voient le **même** fil. Pas de masquage V1.
|
||||||
|
|
||||||
|
### E3 — [Back] Mess. RPE — privée + ajout de participants
|
||||||
|
Fil 1↔1 par défaut (parent↔RPE ou AM↔RPE) ; possibilité d’**ajouter** 2ᵉ parent / AM / parent pour médiation.
|
||||||
|
|
||||||
|
### E4 — [Front] Colonne messagerie parent (onglets Mess. AM | Mess. RPE)
|
||||||
|
UI chat + saisie + PJ ; défaut = Mess. AM.
|
||||||
|
|
||||||
|
### E5 — [Front] Colonne messagerie AM (onglets équivalents)
|
||||||
|
Miroir parent ; Mess. AM = foyer courant ; Mess. RPE = canal relais.
|
||||||
|
|
||||||
|
### E6 — [Front] Mess. RPE côté gestionnaire (entrée minimale)
|
||||||
|
Liste / réponse aux fils RPE + ajout de participants pour médiation.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Epic F — Navigation & mobile (socle)
|
||||||
|
|
||||||
|
### F1 — [Front] Navigation Agenda / Contrat (stubs ou routes)
|
||||||
|
Entrées bandeau : pages **placeholder** ou squelette (Agenda / Contrat pleine page) pour ne pas bloquer le TdB — contenu métier = jalons suivants.
|
||||||
|
|
||||||
|
### F2 — [Front] Adaptation mobile — swipe 3 panneaux
|
||||||
|
Sur téléphone : swipe Blog ↔ Cartes ↔ Messagerie ; navigation TdB/Agenda/Contrat hors swipe. Contrat peut rester limité (« mieux sur PC ») en V1 si besoin.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Epic G — Données de démo / peuplement
|
||||||
|
|
||||||
|
### G1 — [Back/Outillage] Jeu de données peuplé quotidien
|
||||||
|
Scripts / seeds : foyer 2 parents, AM, enfant(s), quelques cartes, posts blog, fils messagerie — pour enchaîner une démo multi-écrans sans saisie manuelle lourde.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Hors découpage (volontairement)
|
||||||
|
|
||||||
|
| Sujet | Motif |
|
||||||
|
|-------|--------|
|
||||||
|
| Page Contrat (Pajemploi, CP, avenants) | Module valué — jalon dédié |
|
||||||
|
| Agenda calendrier riche | Entrée bandeau OK en stub ; métier plus tard |
|
||||||
|
| Notifs CDC (contrat/paiement/dossier) | Plus tard |
|
||||||
|
| Masquage messages / privé parent↔AM | Plus tard |
|
||||||
|
| Parent auteur de posts blog | Hypothétique / plus tard |
|
||||||
|
| Photo parent à l’inscription | Non ; éventuel menu profil plus tard |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Ordre de réalisation suggéré
|
||||||
|
|
||||||
|
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**.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Validation
|
||||||
|
|
||||||
|
Backlog créé sur Gitea (**#165–#189**, milestone `0.2.0`).
|
||||||
|
**Implémentation code** : seulement après relecture PO / ajustements éventuels sur le découpage.
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
# Mini-spec — Quotidien parent / AM
|
||||||
|
|
||||||
|
> **Statut :** figée pour backlog (sept. 2026)
|
||||||
|
> **Réf. visuelle :** [maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png](./maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png)
|
||||||
|
> **Découpage tickets :** [30_DECOUPAGE-TICKETS-QUOTIDIEN.md](./30_DECOUPAGE-TICKETS-QUOTIDIEN.md)
|
||||||
|
> **CDC :** vision d’origine conservée ; priorités UX évoluées (blog central, couple enfant–nounou)
|
||||||
|
|
||||||
|
## 1. Objectif
|
||||||
|
|
||||||
|
Construire les **espaces parent et AM du quotidien** : tableau de bord 3 colonnes, file de cartes (absences / congés / sorties), **blog** (cœur du jour), **messagerie** AM et RPE. Logiciel réel peuplé de données ; une démo = sync live multi-écrans (parent / AM / gestionnaire).
|
||||||
|
|
||||||
|
## 2. UI — contrainte non négociable
|
||||||
|
|
||||||
|
- Look **papier / pastel**, lignée **login / inscription** (`paper2.png`), pas le dashboard staff violet Material
|
||||||
|
- PC paysage : **3 colonnes** égales
|
||||||
|
- Mobile : **swipe** entre les 3 panneaux ; TdB / Agenda / Contrat via nav dédiée
|
||||||
|
|
||||||
|
### Architecture front — maximiser les widgets partagés
|
||||||
|
|
||||||
|
Parent et AM sont **quasi identiques** : **ne pas dupliquer** les colonnes métier.
|
||||||
|
|
||||||
|
| Brique | Usage |
|
||||||
|
|--------|--------|
|
||||||
|
| Widget **Blog** | Colonne milieu parent **et** AM (+ entrée publication gestionnaire qui réutilise le composeur) |
|
||||||
|
| Widget **Messagerie** | Colonne droite parent **et** AM (+ vue gestionnaire RPE) |
|
||||||
|
| Widget **flux de cartes** | Colonne gauche parent **et** AM (actions / droits selon rôle) |
|
||||||
|
| Widget **bandeau couple** | Variante *enfant\|nounou* (parent) vs *enfant\|parent(s)* (AM) — même composant paramétré |
|
||||||
|
| Coquille TdB 3 colonnes | Layout / bandeau navig commun ; le rôle injecte le couple + droits |
|
||||||
|
|
||||||
|
Principe : **briques correctement encapsulées** (API claire props / callbacks), branchées sur le même back ; seules les **différences de rôle** (qui crée quoi, libellés d’action) restent hors du widget partagé.
|
||||||
|
|
||||||
|
|
||||||
|
## 3. Layout TdB
|
||||||
|
|
||||||
|
| Colonne | Contenu |
|
||||||
|
|---------|---------|
|
||||||
|
| **Gauche** | Couple actif · flux de **cartes** · actions (ex. Déclarer une absence) |
|
||||||
|
| **Milieu** | **Blog** — affichage **par défaut** à l’arrivée |
|
||||||
|
| **Droite** | **Messagerie** seule — onglets Mess. AM (défaut) \| Mess. RPE |
|
||||||
|
|
||||||
|
Bandeau : **TdB** · **Agenda** · **Contrat** · menu user (recherche AM, paramètres…).
|
||||||
|
|
||||||
|
### Parent — couple
|
||||||
|
|
||||||
|
- Un bandeau **enfant | nounou** (photos + noms)
|
||||||
|
- Plusieurs gardes → dropdown unique (bascule de couple)
|
||||||
|
- Une seule garde → affichage informatif (pas de chevron)
|
||||||
|
|
||||||
|
### AM — couple (miroir)
|
||||||
|
|
||||||
|
- Bandeau **enfant | parent(s)**
|
||||||
|
- 2 parents : noms empilés à droite ; 1 parent : nom centré
|
||||||
|
- Pas de photo parent obligatoire (option profil plus tard)
|
||||||
|
|
||||||
|
## 4. Canaux (ne pas mélanger)
|
||||||
|
|
||||||
|
| Canal | Rôle |
|
||||||
|
|-------|------|
|
||||||
|
| **Cartes** | Décisions / futur proche : absences, congés, maladie AM, sorties à valider |
|
||||||
|
| **Blog** | Mémoire / actus du quotidien (texte + photos) — **indispensable**, plus un module optionnel CDC §9 |
|
||||||
|
| **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 (absences / congés)
|
||||||
|
|
||||||
|
| 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
|
||||||
|
- Couple actif filtre cartes + messagerie + blog (hypothèse produit : **oui**)
|
||||||
|
|
||||||
|
## 6. Hors périmètre de ce jalon
|
||||||
|
|
||||||
|
- Page **Contrat** riche (Pajemploi, CP…) — stub bandeau OK
|
||||||
|
- **Agenda** calendrier riche — stub bandeau OK
|
||||||
|
- Notifications CDC fourre-tout (paiement, dossier…)
|
||||||
|
- Masquage messages ; posts blog parent
|
||||||
|
- Carnet repas/sieste (roadmap Phase 4)
|
||||||
|
|
||||||
|
## 7. Critères « effet démo » (acceptation)
|
||||||
|
|
||||||
|
Avec données peuplées, sur au moins 2 supports :
|
||||||
|
|
||||||
|
1. Parent et AM voient le **même contexte de garde** (couple / enfant)
|
||||||
|
2. Parent déclare une **absence** → carte visible côté AM
|
||||||
|
3. AM publie un **post blog** (texte + photo) → visible colonne blog parent
|
||||||
|
4. Gestionnaire publie une **annonce RPE** → visible sur les TdB concernés
|
||||||
|
5. Message **Mess. AM** d’un côté → apparaît de l’autre (près temps réel)
|
||||||
|
6. Look conforme charte papier / pastel
|
||||||
|
|
||||||
|
## 8. Point de départ code
|
||||||
|
|
||||||
|
- Parent : `frontend/lib/screens/home/parent_screen/ParentDashboardScreen.dart` + `dashbord_parent/`
|
||||||
|
- AM : `frontend/lib/screens/am/am_dashboard_screen.dart` (placeholder)
|
||||||
|
- Cartes couleurs : `frontend/assets/cards/` (7 teintes max)
|
||||||
|
|
||||||
|
## 9. Ordre de build suggéré
|
||||||
|
|
||||||
|
Voir [30_DECOUPAGE-TICKETS-QUOTIDIEN.md](./30_DECOUPAGE-TICKETS-QUOTIDIEN.md) § ordre — A (coquille parent) → C (cartes) → D (blog) → E (messagerie) → B (miroir AM) → RPE → F/G (mobile + seeds).
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Maquettes — espaces parent / AM (quotidien)
|
||||||
|
|
||||||
|
Références visuelles issues de l’atelier de cadrage (sept. 2026).
|
||||||
|
|
||||||
|
## Organisation
|
||||||
|
|
||||||
|
| Dossier | Contenu |
|
||||||
|
|---------|---------|
|
||||||
|
| [`courantes/`](./courantes/) | **Référence active** — à utiliser pour tickets / implémentation |
|
||||||
|
| [`historique/`](./historique/) | Itérations précédentes + croquis manuscrit (conservées pour traçabilité) |
|
||||||
|
|
||||||
|
## Référence active
|
||||||
|
|
||||||
|
| Fichier | Description |
|
||||||
|
|---------|-------------|
|
||||||
|
| [`courantes/maquette-dashboard-parent-quotidien-v4.png`](./courantes/maquette-dashboard-parent-quotidien-v4.png) | TdB parent PC — **3 colonnes** : cartes + couple · blog (défaut) · messagerie (AM / RPE) |
|
||||||
|
|
||||||
|
## Historique
|
||||||
|
|
||||||
|
| Fichier | Note |
|
||||||
|
|---------|------|
|
||||||
|
| [`historique/croquis-dashboard-parent-2026-09-23.jpg`](./historique/croquis-dashboard-parent-2026-09-23.jpg) | Wireframe manuscrit (WhatsApp) — point de départ layout |
|
||||||
|
| `…-v1.png` | Première génération IA (~50/50) |
|
||||||
|
| `…-v2.png` | Recadrage 1/3 + 2/3 (onglets Mess/Blog à droite) |
|
||||||
|
| `…-v3.png` | Couple enfant–nounou (encore 2 colonnes) |
|
||||||
|
|
||||||
|
## Suite éventuelle
|
||||||
|
|
||||||
|
- Maquette **TdB AM** (miroir : bandeau enfant \| parent(s)) — pas encore générée.
|
||||||
|
After Width: | Height: | Size: 185 KiB |
|
After Width: | Height: | Size: 50 KiB |
|
After Width: | Height: | Size: 149 KiB |
|
After Width: | Height: | Size: 149 KiB |
|
After Width: | Height: | Size: 178 KiB |
@@ -1,89 +0,0 @@
|
|||||||
# Mini-spec API — POST /parents/dossier (#129)
|
|
||||||
|
|
||||||
Contrat pour le **plan front** (wizard création dossier famille staff).
|
|
||||||
|
|
||||||
Miroir de **#156** (`POST /assistantes-maternelles/dossier`).
|
|
||||||
|
|
||||||
## Endpoint
|
|
||||||
|
|
||||||
| | |
|
|
||||||
|--|--|
|
|
||||||
| **Méthode** | `POST` |
|
|
||||||
| **URL** | `{base}/parents/dossier` |
|
|
||||||
| **Auth** | Bearer JWT |
|
|
||||||
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
|
||||||
| **Content-Type** | `application/json` |
|
|
||||||
|
|
||||||
Ne **pas** appeler `POST /auth/register/parent` depuis le dashboard.
|
|
||||||
|
|
||||||
## Body (JSON)
|
|
||||||
|
|
||||||
Aligné `RegisterParentCompletDto`, **sans** CGU/privacy obligatoires (acceptées serveur).
|
|
||||||
|
|
||||||
### Parent 1 (obligatoire)
|
|
||||||
|
|
||||||
| Champ | Type | Obligatoire | Notes |
|
|
||||||
|-------|------|-------------|--------|
|
|
||||||
| `email` | string | oui | unique |
|
|
||||||
| `prenom` | string | oui | |
|
|
||||||
| `nom` | string | oui | |
|
|
||||||
| `telephone` | string | oui | `0X…` ou `+33…` |
|
|
||||||
| `adresse` | string | non | |
|
|
||||||
| `code_postal` | string | non | |
|
|
||||||
| `ville` | string | non | |
|
|
||||||
|
|
||||||
### Co-parent (optionnel)
|
|
||||||
|
|
||||||
`co_parent_email`, `co_parent_prenom`, `co_parent_nom`, `co_parent_telephone`,
|
|
||||||
`co_parent_meme_adresse`, `co_parent_adresse`, `co_parent_code_postal`, `co_parent_ville`.
|
|
||||||
|
|
||||||
Si co-parent fourni : e-mail distinct ; mêmes règles téléphone / adresse que register.
|
|
||||||
|
|
||||||
### Enfants (≥ 1)
|
|
||||||
|
|
||||||
| Champ | Type | Notes |
|
|
||||||
|-------|------|--------|
|
|
||||||
| `enfants` | `EnfantInscriptionDto[]` | `prenom`, `nom`, `date_naissance` / `date_previsionnelle_naissance`, `genre`, `photo_base64`, `photo_filename`, etc. |
|
|
||||||
|
|
||||||
### Présentation
|
|
||||||
|
|
||||||
| Champ | Type | Obligatoire |
|
|
||||||
|-------|------|-------------|
|
|
||||||
| `presentation_dossier` | string | non (max 2000) |
|
|
||||||
|
|
||||||
## Réponses
|
|
||||||
|
|
||||||
### 201 Created
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"message": "Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.",
|
|
||||||
"numero_dossier": "2026-000043",
|
|
||||||
"parent_user_id": "uuid-pivot",
|
|
||||||
"co_parent_user_id": "uuid-ou-null",
|
|
||||||
"statut": "actif",
|
|
||||||
"enfant_ids": ["uuid", "..."]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Effets serveur : user(s) parent **actif**, fiches `parents`, enfants + foyer, n° dossier,
|
|
||||||
**e-mail création MDP** pour chaque compte sans MDP (pas d’accusé « en attente »).
|
|
||||||
|
|
||||||
### Erreurs
|
|
||||||
|
|
||||||
| Code | Cas |
|
|
||||||
|------|-----|
|
|
||||||
| 400 | Validation DTO / métier (enfants vides, dates, etc.) |
|
|
||||||
| 401 | Token manquant / invalide |
|
|
||||||
| 403 | Rôle non staff |
|
|
||||||
| 409 | Conflit e-mail (pivot et/ou co-parent) |
|
|
||||||
|
|
||||||
## Front
|
|
||||||
|
|
||||||
- `UserService.createParentDossier(body)` → cet endpoint
|
|
||||||
- Wizard create basé sur `ValidationFamilyWizard`
|
|
||||||
- Ne pas envoyer `acceptation_cgu` / `acceptation_privacy` (optionnels)
|
|
||||||
|
|
||||||
## Branche
|
|
||||||
|
|
||||||
`feature/129-creation-dossier-parent`
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
# Mini-spec API — POST /parents/:id/co-parent (#135)
|
|
||||||
|
|
||||||
Contrat back pour l’ajout d’un **2ᵉ parent** sur un foyer mono-parent (staff).
|
|
||||||
|
|
||||||
## Endpoint
|
|
||||||
|
|
||||||
| | |
|
|
||||||
|--|--|
|
|
||||||
| **Méthode** | `POST` |
|
|
||||||
| **URL** | `{base}/api/v1/parents/{parentUserId}/co-parent` |
|
|
||||||
| **Auth** | Bearer JWT |
|
|
||||||
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
|
||||||
| **Succès** | **201** |
|
|
||||||
|
|
||||||
`parentUserId` = UUID du **parent pivot** (déjà dans le dossier).
|
|
||||||
|
|
||||||
Ne **pas** appeler `POST /auth/register/parent` ni `POST /parents/dossier`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Body (JSON)
|
|
||||||
|
|
||||||
| Champ | Type | Obligatoire | Notes |
|
|
||||||
|-------|------|-------------|--------|
|
|
||||||
| `email` | string | oui | unique |
|
|
||||||
| `prenom` | string | oui | |
|
|
||||||
| `nom` | string | oui | |
|
|
||||||
| `telephone` | string | oui | `0X…` ou `+33…` |
|
|
||||||
| `meme_adresse` | bool | non | défaut **true** → copie adresse du pivot |
|
|
||||||
| `adresse` | string | si `meme_adresse=false` | |
|
|
||||||
| `code_postal` | string | si `meme_adresse=false` | |
|
|
||||||
| `ville` | string | si `meme_adresse=false` | |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Comportement 201
|
|
||||||
|
|
||||||
- User co-parent **actif** + token création MDP
|
|
||||||
- Fiche `parents` + liens pivot ↔ co-parent + même `numero_dossier`
|
|
||||||
- Enfants du foyer rattachés au co-parent
|
|
||||||
- E-mail **création MDP** (pas mail « en attente »)
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"message": "Co-parent ajouté au foyer. Un e-mail de création de mot de passe a été envoyé.",
|
|
||||||
"numero_dossier": "2026-000043",
|
|
||||||
"parent_user_id": "uuid-pivot",
|
|
||||||
"co_parent_user_id": "uuid-co",
|
|
||||||
"statut": "actif"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Erreurs
|
|
||||||
|
|
||||||
| Code | Cas |
|
|
||||||
|------|-----|
|
|
||||||
| 400 | Déjà un co-parent / 2 responsables / validation adresse |
|
|
||||||
| 401 | Token invalide |
|
|
||||||
| 403 | Rôle non staff |
|
|
||||||
| 404 | Pivot introuvable |
|
|
||||||
| 409 | Email déjà pris |
|
|
||||||
|
|
||||||
## Réemploi édition identité
|
|
||||||
|
|
||||||
| Endpoint | Usage |
|
|
||||||
|----------|--------|
|
|
||||||
| `GET /dossiers/:numero` | Préremplir wizard edit |
|
|
||||||
| `PATCH /parents/:id/fiche` | Sauver identité pivot / co-parent existant |
|
|
||||||
| `PATCH /assistantes-maternelles/:id/fiche` | Édition AM |
|
|
||||||
|
|
||||||
## Branche
|
|
||||||
|
|
||||||
`feature/135-edition-dossier`
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
# Mini-spec front — Mode édition dossier + ajout 2ᵉ parent (#135)
|
|
||||||
|
|
||||||
Branche : `feature/135-edition-dossier`
|
|
||||||
Ticket : **#135** (full-stack)
|
|
||||||
|
|
||||||
Prérequis : **#153** (liste Dossiers) livré.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Objectif
|
|
||||||
|
|
||||||
1. Clic sur un dossier (liste #153) → ouvrir le wizard en mode **`edit`**
|
|
||||||
2. Foyer **mono-parent** : page co-parent → **switch** ajouter un 2ᵉ parent
|
|
||||||
3. Sauvegarder les champs via APIs existantes + nouvel endpoint co-parent
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Modes wizard
|
|
||||||
|
|
||||||
| Mode | Famille | AM |
|
|
||||||
|------|---------|-----|
|
|
||||||
| `review` | déjà | déjà |
|
|
||||||
| `create` | déjà (#129) | déjà (#156) |
|
|
||||||
| **`edit`** | **à faire** | **à faire** |
|
|
||||||
|
|
||||||
Factories : `ParentDossierWizard.edit(...)` / `AmDossierWizard.edit(...)`
|
|
||||||
Préremplir via `UserService.getDossierByNumero(numero)`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## APIs
|
|
||||||
|
|
||||||
| Action | Endpoint |
|
|
||||||
|--------|----------|
|
|
||||||
| Charger | `GET /dossiers/:numero` |
|
|
||||||
| Sauver parent | `PATCH /parents/:id/fiche` |
|
|
||||||
| Sauver AM | `PATCH /assistantes-maternelles/:id/fiche` |
|
|
||||||
| **Ajouter co-parent** | **`POST /parents/:pivotUserId/co-parent`** — voir `docs/tmp/135-contrat-api-ajout-co-parent.md` |
|
|
||||||
|
|
||||||
Body co-parent :
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"email": "thomas@…",
|
|
||||||
"prenom": "Thomas",
|
|
||||||
"nom": "MARTIN",
|
|
||||||
"telephone": "0678456789",
|
|
||||||
"meme_adresse": true
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
`UserService.addCoParent(pivotUserId, body)` → cet endpoint.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## UX
|
|
||||||
|
|
||||||
- Depuis `DossiersManagementWidget` / carte liste : clic → edit (plus seulement review pending)
|
|
||||||
- Pending : garder validation (review) ; dossiers actifs → edit
|
|
||||||
- Mono-parent : switch « Ajouter un co-parent » (comme create) → au save, `POST …/co-parent` si nouveau
|
|
||||||
- Déjà 2 parents : éditer les deux fiches ; pas de 3ᵉ
|
|
||||||
- Pas de bouton créer dans l’onglet Dossiers
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Hors scope
|
|
||||||
|
|
||||||
- Famille N responsables (#139)
|
|
||||||
- Suppressions (#154)
|
|
||||||
- Création dossier initial (#129 / #156)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Critères d’acceptation
|
|
||||||
|
|
||||||
- [ ] Clic dossier actif → wizard edit prérempli
|
|
||||||
- [ ] PATCH fiche enregistre les modifs
|
|
||||||
- [ ] Mono-parent + switch → co-parent créé (actif + mail MDP)
|
|
||||||
- [ ] review / create inchangés
|
|
||||||
|
|
||||||
## Branche
|
|
||||||
|
|
||||||
`feature/135-edition-dossier`
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
# Mini-spec — Suppression complète grossesse multiple / `est_multiple`
|
|
||||||
|
|
||||||
**Ticket** : **#152** — https://git.ptits-pas.fr/jmartin/petitspas/issues/152
|
|
||||||
**Branche** : `feature/152-remove-est-multiple` (depuis `develop`)
|
|
||||||
**Périmètre** : **full stack** — BDD + back + front + scripts + docs. **Aucun fantôme.**
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Décision
|
|
||||||
|
|
||||||
On **supprime tout**. Pas de DTO « ignorés », pas de compat payload.
|
|
||||||
|
|
||||||
`forbidNonWhitelisted: true` ⇒ back et front **partent ensemble** (même feature / même déploiement).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Alias retirés
|
|
||||||
|
|
||||||
`est_multiple` · `is_multiple` · `grossesse_multiple` · `multipleBirth` · `estMultiple` · `isMultiple` · `jumeau_multiple`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Back / BDD (fait sur la branche)
|
|
||||||
|
|
||||||
- [x] Migration `database/migrations/2026_drop_enfants_est_multiple.sql`
|
|
||||||
- [x] `BDD.sql`, seeds, CSV test
|
|
||||||
- [x] Entity `Children` sans colonne
|
|
||||||
- [x] DTO create/inscription/réponse/dossier famille **sans** le champ
|
|
||||||
- [x] Services auth / enfants / parents : plus de mapping
|
|
||||||
- [x] Prisma legacy `isMultiple` retiré
|
|
||||||
|
|
||||||
## Front (fait sur la branche)
|
|
||||||
|
|
||||||
- [x] Modèles admin / dossier / inscription
|
|
||||||
- [x] Payloads inscription + reprise
|
|
||||||
- [x] Modale enfant + wizard dossier famille
|
|
||||||
- [x] Step3 inscription parent
|
|
||||||
|
|
||||||
## Scripts / docs
|
|
||||||
|
|
||||||
- [x] `tests/scripts/register-parent-*.mjs`
|
|
||||||
- [x] `docs/10_DATABASE.md`, `docs/99_REGLES-CODAGE.md`
|
|
||||||
- Docs tmp/archive #112 : mentions historiques OK (archive)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Déploiement
|
|
||||||
|
|
||||||
1. Appliquer la migration SQL sur la BDD vivante
|
|
||||||
2. Deploy back **et** front de cette branche
|
|
||||||
3. Smoke : création enfant staff, inscription parent, reprise, wizard famille
|
|
||||||
|
|
||||||
## Vérif
|
|
||||||
|
|
||||||
```bash
|
|
||||||
rg -n 'est_multiple|is_multiple|grossesse_multiple|multipleBirth|estMultiple|isMultiple|jumeau_multiple' \
|
|
||||||
backend/src frontend/lib database tests/scripts docs/10_DATABASE.md docs/99_REGLES-CODAGE.md
|
|
||||||
```
|
|
||||||
→ **0** hit (hors ce fichier mini-spec / archives).
|
|
||||||
|
|
||||||
## Hors scope
|
|
||||||
|
|
||||||
- Métier futur « fratrie / jumeaux » → nouveau ticket
|
|
||||||
- #155 rename Admin*
|
|
||||||
- Ticket modales staff
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
# Mini-spec API — GET /dossiers (#153)
|
|
||||||
|
|
||||||
Contrat pour le **plan front** (onglet permanent Dossiers).
|
|
||||||
|
|
||||||
## Endpoint
|
|
||||||
|
|
||||||
| | |
|
|
||||||
|--|--|
|
|
||||||
| **Méthode** | `GET` |
|
|
||||||
| **URL** | `{base}/api/v1/dossiers` |
|
|
||||||
| **Auth** | Bearer JWT |
|
|
||||||
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
|
||||||
| **Query** | `q` (optionnel) — recherche n° / libellé / email |
|
|
||||||
|
|
||||||
Complète `GET /dossiers/:numeroDossier` (#119) déjà existant.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Réponse 200
|
|
||||||
|
|
||||||
Tableau de lignes (1 entrée = 1 `numero_dossier`) :
|
|
||||||
|
|
||||||
```json
|
|
||||||
[
|
|
||||||
{
|
|
||||||
"type": "famille",
|
|
||||||
"numero_dossier": "2026-000043",
|
|
||||||
"libelle": "Claire MARTIN & Thomas MARTIN",
|
|
||||||
"emails": ["claire@test.fr", "thomas@test.fr"],
|
|
||||||
"user_ids": ["uuid-pivot", "uuid-co"],
|
|
||||||
"statut": "actif",
|
|
||||||
"a_valider": false,
|
|
||||||
"date_reference": "2026-01-12T10:00:00.000Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "assistante_maternelle",
|
|
||||||
"numero_dossier": "2026-000042",
|
|
||||||
"libelle": "Marie DUPONT",
|
|
||||||
"emails": ["marie@test.fr"],
|
|
||||||
"user_ids": ["uuid-am"],
|
|
||||||
"statut": "en_attente",
|
|
||||||
"a_valider": true,
|
|
||||||
"date_reference": "2026-02-01T08:00:00.000Z"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
```
|
|
||||||
|
|
||||||
### Champs
|
|
||||||
|
|
||||||
| Champ | Notes |
|
|
||||||
|-------|--------|
|
|
||||||
| `type` | `famille` \| `assistante_maternelle` |
|
|
||||||
| `numero_dossier` | Clé d’unité |
|
|
||||||
| `libelle` | Noms formatés (foyer : `A & B`) |
|
|
||||||
| `emails` / `user_ids` | Membres du foyer ou AM |
|
|
||||||
| `statut` | Agrégé : `en_attente` si au moins un user pending |
|
|
||||||
| `a_valider` | `true` si pending → section haute UI |
|
|
||||||
| `date_reference` | `MIN(cree_le)` des users |
|
|
||||||
|
|
||||||
**Tri** : `a_valider` d’abord, puis `numero_dossier` décroissant.
|
|
||||||
|
|
||||||
**Famille** : dédupliquée par `numero_dossier` (pivot + co-parent = 1 ligne).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Front
|
|
||||||
|
|
||||||
- `UserService.getDossiers({ q? })` → cet endpoint
|
|
||||||
- Section haute : filtrer `a_valider == true` **ou** continuer pending APIs existantes
|
|
||||||
- Section basse : liste complète (ou hors pending selon règle UX)
|
|
||||||
- Clic → `GET /dossiers/:numero` (détail) / validation review
|
|
||||||
|
|
||||||
Composition client `getParents`+`getAM` **plus nécessaire** si cet endpoint est déployé.
|
|
||||||
|
|
||||||
## Branche
|
|
||||||
|
|
||||||
`feature/153-onglet-dossiers`
|
|
||||||
@@ -1,167 +0,0 @@
|
|||||||
# Mini-spec front — Onglet permanent « Dossiers » (#153)
|
|
||||||
|
|
||||||
Branche Git (front + back) : `feature/153-onglet-dossiers`
|
|
||||||
Ticket Gitea : **#153** (ticket normal, plus epic)
|
|
||||||
|
|
||||||
> Suite prévue : **#135** = au clic, mode **édition** wizard + ajout 2ᵉ parent.
|
|
||||||
> **#153** = onglet + listes + navigation / validation pending. **Pas** de création, **pas** d’édition complète.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Contexte / objectif
|
|
||||||
|
|
||||||
Remplacer l’onglet conditionnel **« À valider »** (apparaît/disparaît selon pending) par un onglet **permanent « Dossiers »** dans le dashboard admin/gestionnaire.
|
|
||||||
|
|
||||||
Quand on ouvre **Dossiers** :
|
|
||||||
|
|
||||||
1. **En haut** — section **Dossiers à valider** (AM + familles pending)
|
|
||||||
2. **En dessous** — liste de **tous les dossiers** (familles **et** AM), 1 ligne = 1 `numero_dossier`
|
|
||||||
3. Différenciation visuelle famille vs AM : **couleur + icône**
|
|
||||||
4. **Barre de recherche** (n° dossier, nom, email…)
|
|
||||||
|
|
||||||
**Pas** de bouton « Créer un dossier » ici (création via **+ Parents** #129 / **+ Asmat** #156).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## UX cible
|
|
||||||
|
|
||||||
### Onglets dashboard (`UserManagementPanel`)
|
|
||||||
|
|
||||||
| Avant (#107) | Après (#153) |
|
|
||||||
|--------------|--------------|
|
|
||||||
| « À valider » **conditionnel** si pending | **« Dossiers » toujours visible** (admin + gestionnaire) |
|
|
||||||
| Contenu = seulement pending | Pending **en haut** + liste complète **en bas** |
|
|
||||||
|
|
||||||
Ordre suggéré des onglets :
|
|
||||||
|
|
||||||
`Dossiers` | `Parents` | `Enfants` | `Assistantes maternelles` | `Gestionnaires` | (`Administrateurs`)
|
|
||||||
|
|
||||||
### Section haute — À valider
|
|
||||||
|
|
||||||
- Réutiliser / adapter `PendingValidationWidget` (ou extraire la liste dans un sous-widget).
|
|
||||||
- Sources déjà branchées :
|
|
||||||
- `UserService.getPendingUsers(role: 'assistante_maternelle')`
|
|
||||||
- `UserService.getPendingFamilies()`
|
|
||||||
- Clic ligne pending → **`ValidationDossierModal`** / wizards `.review` (inchangé).
|
|
||||||
- Si section vide : ne pas afficher de gros vide ; masquer la section ou message court « Aucun dossier en attente ».
|
|
||||||
|
|
||||||
### Section basse — Tous les dossiers
|
|
||||||
|
|
||||||
1 ligne = **1 dossier** (`numero_dossier`), type :
|
|
||||||
|
|
||||||
| Type | Libellé UI | Couleur (suggestion) |
|
|
||||||
|------|------------|----------------------|
|
|
||||||
| `famille` | Famille / Parents | teinte existante parents (ex. violet / rose dashboard) |
|
|
||||||
| `assistante_maternelle` | AM | teinte existante AM (ex. teal / bleu) |
|
|
||||||
|
|
||||||
Colonnes / infos utiles (cartes style `AdminUserCard` ou lignes type pending) :
|
|
||||||
|
|
||||||
- n° dossier
|
|
||||||
- type (pastille couleur + icône)
|
|
||||||
- libellé (noms parents ou AM)
|
|
||||||
- email(s) principal(aux)
|
|
||||||
- statut user / dossier si dispo (`actif`, `en_attente`, …)
|
|
||||||
- date utile si dispo
|
|
||||||
|
|
||||||
**Déduplication** : un foyer (pivot + co-parent) = **une** ligne famille (même `numero_dossier`). Idem AM.
|
|
||||||
|
|
||||||
### Recherche
|
|
||||||
|
|
||||||
- La search bar du panel (aujourd’hui désactivée / hint « pas de recherche » sur À valider) doit **filtrer la liste unifiée** (et idéalement aussi le pending affiché).
|
|
||||||
- Critères **minimum** : `numero_dossier`, nom, prénom, email.
|
|
||||||
- Harmoniser le hint : `Rechercher un dossier (n°, nom, email)…`
|
|
||||||
|
|
||||||
### État vide liste complète
|
|
||||||
|
|
||||||
Aide optionnelle : *« Pour créer un dossier → onglet Parents (+ Parents) ou Assistantes maternelles (+ Asmat) »*.
|
|
||||||
|
|
||||||
### Clic sur un dossier de la liste complète (#153)
|
|
||||||
|
|
||||||
| Cas | Comportement #153 |
|
|
||||||
|-----|-------------------|
|
|
||||||
| Pending | Ouvrir validation (review) — déjà en place |
|
|
||||||
| Dossier **actif** / non pending | Ouvrir consultation via `GET /dossiers/:numeroDossier` (`UserService.getDossierByNumero`) en **lecture / review** si possible **sans** save édition |
|
|
||||||
|
|
||||||
**Ne pas** implémenter le mode `edit` ni le switch 2ᵉ parent → **#135**.
|
|
||||||
|
|
||||||
Si l’ouverture « review » d’un dossier actif est trop lourde pour ce ticket : clic peut temporairement no-op / snackbar *« Édition dossier : prochainement (#135) »* — **à éviter** si `getDossierByNumero` + wizard review marche déjà pour les deux types.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Données / APIs (front)
|
|
||||||
|
|
||||||
### Déjà disponibles (préférer composer côté front pour #153)
|
|
||||||
|
|
||||||
| Besoin | API / service |
|
|
||||||
|--------|----------------|
|
|
||||||
| Pending AM | `getPendingUsers(role: assistante_maternelle)` |
|
|
||||||
| Pending familles | `getPendingFamilies()` |
|
|
||||||
| Parents (avec `numero_dossier`) | `getParents()` |
|
|
||||||
| AM (avec `numero_dossier`) | `getAssistantesMaternelles()` |
|
|
||||||
| Détail unifié | `getDossierByNumero(numero)` → `GET /dossiers/:numeroDossier` |
|
|
||||||
|
|
||||||
**Pas d’endpoint `GET /dossiers` liste** aujourd’hui. Pour #153 :
|
|
||||||
|
|
||||||
- Construire la liste unifiée **côté client** à partir de `getParents()` + `getAssistantesMaternelles()` (group by `numero_dossier`).
|
|
||||||
- Exclure ou marquer les pending déjà dans la section haute (éviter doublons visuels, ou les laisser dans les deux avec badge « à valider » — **préférence** : pending **uniquement** en haut ; liste basse = tous **hors** pending **ou** tous avec badge ; choisir une règle claire et documenter dans le PR).
|
|
||||||
|
|
||||||
**Règle recommandée** :
|
|
||||||
- Haut = pending only
|
|
||||||
- Bas = **tous** les dossiers ayant un `numero_dossier` (y compris pending) **OU** bas = non-pending only
|
|
||||||
→ **Recommandation produit** : bas = **tous** (vision complète), pending aussi en haut pour action rapide. Si doublon gênant : bas = non-pending only.
|
|
||||||
|
|
||||||
### Si le back ajoute plus tard `GET /dossiers`
|
|
||||||
|
|
||||||
Brancher `UserService.getDossiers()` — hors scope bloquant #153 front si composition client OK.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Fichiers front probables
|
|
||||||
|
|
||||||
| Fichier | Rôle |
|
|
||||||
|---------|------|
|
|
||||||
| `frontend/lib/widgets/admin/user_management_panel.dart` | Onglet permanent **Dossiers** ; retirer logique conditionnelle À valider ; search sur cet onglet |
|
|
||||||
| `frontend/lib/widgets/admin/pending_validation_widget.dart` | Réemploi section haute (ou refactor léger) |
|
|
||||||
| **Nouveau** `…/dossiers_management_widget.dart` (nom libre) | Shell onglet : pending + liste unifiée + refresh |
|
|
||||||
| **Nouveau** modèle léger `DossierListItem` (type, numero, libelle, emails, statut…) | Mapping parents/AM → ligne |
|
|
||||||
| `user_service.dart` / `api_config.dart` | Seulement si helper `getDossiersUnified()` côté client (pas forcément nouvel endpoint) |
|
|
||||||
| `validation_dossier_modal.dart` | Réemploi ouverture pending / détail |
|
|
||||||
|
|
||||||
Réutiliser look & feel cartes / hover « Ouvrir » de `_PendingValidationRow` / `AdminUserCard`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Hors scope (#153)
|
|
||||||
|
|
||||||
- Bouton créer dossier
|
|
||||||
- Mode `edit` wizard + ajout 2ᵉ parent → **#135**
|
|
||||||
- Suppressions → **#154**
|
|
||||||
- Famille N responsables → **#139**
|
|
||||||
- Changer les onglets Parents / AM / Enfants (restent)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Critères d’acceptation front
|
|
||||||
|
|
||||||
- [ ] Onglet **Dossiers** toujours visible (même 0 pending)
|
|
||||||
- [ ] Plus d’onglet conditionnel **« À valider »**
|
|
||||||
- [ ] Section haute pending si non vide ; validation au clic OK
|
|
||||||
- [ ] Liste unifiée familles + AM en dessous ; 1 ligne / `numero_dossier`
|
|
||||||
- [ ] Couleur + icône différencient famille / AM
|
|
||||||
- [ ] Recherche filtre (n° + nom + email minimum)
|
|
||||||
- [ ] **Aucun** bouton créer dans cet onglet
|
|
||||||
- [ ] Pas de régression validation pending (valider / refuser)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Back (info — Cursor back séparé si besoin)
|
|
||||||
|
|
||||||
- Liste unifiée : **pas bloquante** si composition front
|
|
||||||
- Optionnel : `GET /api/v1/dossiers` (liste) pour perf / pagination plus tard
|
|
||||||
- `GET /dossiers/:numero` déjà là (#119)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Branche
|
|
||||||
|
|
||||||
`feature/153-onglet-dossiers` (depuis `develop`)
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
# Matrice suppression — #154 / back **#159** / front **#160**
|
|
||||||
|
|
||||||
**Statut** : cadrage PO validé (sept. 2026)
|
|
||||||
**Milestone** : 0.1.0
|
|
||||||
**Email** : pas d’email de suppression (cas rare)
|
|
||||||
|
|
||||||
## Droits
|
|
||||||
|
|
||||||
| Cible | Qui peut supprimer |
|
|
||||||
|-------|-------------------|
|
|
||||||
| Dossier / parent / enfant / AM | `GESTIONNAIRE`, `ADMINISTRATEUR`, `SUPER_ADMIN` |
|
|
||||||
| Gestionnaire (user) | `ADMINISTRATEUR`, `SUPER_ADMIN` |
|
|
||||||
| Administrateur (user) | Autre admin OK ; **self interdit** ; **dernier admin** = `SUPER_ADMIN` only ; `SUPER_ADMIN` non supprimable |
|
|
||||||
|
|
||||||
## Matrice métier
|
|
||||||
|
|
||||||
| Point d’entrée | Action | Effet |
|
|
||||||
|----------------|--------|--------|
|
|
||||||
| Dossiers | Delete dossier **famille** | Tous **parents** + tous **enfants** ; clore placements AM des enfants |
|
|
||||||
| Dossiers / AM | Delete dossier **AM** ou compte AM | **Compte AM + dossier AM** ; enfants **conservés** ; placements **clos** |
|
|
||||||
| Parents | Co-parent (autre parent reste) | Compte parent seul ; dossier + enfants restent |
|
|
||||||
| Parents | Dernier parent | Parent + **enfants** rattachés |
|
|
||||||
| Enfants | Pas dernier | Enfant seul (retiré du dossier) |
|
|
||||||
| Enfants | Dernier + `deleteDossier=true` | Cascade dossier famille (parents + enfants) |
|
|
||||||
| Enfants | Dernier + `deleteDossier=false` | Enfant seul ; dossier peut apparaître **`sans_enfant`** |
|
|
||||||
| Pending / validé | — | **Mêmes règles** (pas de différenciation) |
|
|
||||||
|
|
||||||
## Warning
|
|
||||||
|
|
||||||
- `sans_enfant` sur liste `GET /dossiers` (dossier famille sans enfant lié).
|
|
||||||
- Miroir de `sans_responsable` (#157) côté enfants.
|
|
||||||
|
|
||||||
## Hors scope
|
|
||||||
|
|
||||||
Soft-delete RGPD, audit (#128), famille N (#139), restriction admin-only métier (plus tard).
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
# Mini-spec front — Suppressions dashboard
|
|
||||||
|
|
||||||
**Ticket front** : **#160** — https://git.ptits-pas.fr/jmartin/petitspas/issues/160
|
|
||||||
**Ticket back** : **#159** — https://git.ptits-pas.fr/jmartin/petitspas/issues/159
|
|
||||||
**Epic** : #154 (complète #133)
|
|
||||||
**Branche back** : `feature/159-suppressions-backend`
|
|
||||||
**Doc matrice** : [154-matrice-suppression.md](./154-matrice-suppression.md)
|
|
||||||
|
|
||||||
Travail **en parallèle** : ce contrat est la source de vérité UI ↔ API.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## UX commune
|
|
||||||
|
|
||||||
Sur chaque ligne / carte des listes :
|
|
||||||
|
|
||||||
- Icône **poubelle** en bout de ligne
|
|
||||||
- Clic → **dialog de confirmation** (texte d’impact) → DELETE → **refresh** liste
|
|
||||||
- Pending = **mêmes** règles que validés
|
|
||||||
- **Pas** d’email
|
|
||||||
|
|
||||||
| Liste | Poubelle visible si |
|
|
||||||
|-------|---------------------|
|
|
||||||
| Dossiers, Parents, Enfants, AM | gestionnaire **ou** admin |
|
|
||||||
| Gestionnaires | **admin** only |
|
|
||||||
| Administrateurs | admin+ ; **pas** sur sa propre ligne ; dernier admin : UI warning + réservé super_admin |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Contrat API
|
|
||||||
|
|
||||||
Base : auth Bearer. Erreurs : `400` / `403` / `404` / `409` avec `message` FR.
|
|
||||||
|
|
||||||
### 1. `DELETE /dossiers/:numeroDossier`
|
|
||||||
|
|
||||||
- **Famille** → supprime tous parents + enfants du n° ; clos placements AM des enfants.
|
|
||||||
- **AM** → compte AM + dossier AM ; enfants gardés ; placements clos.
|
|
||||||
|
|
||||||
**Réponse 200** (exemple) :
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"type": "famille",
|
|
||||||
"numero_dossier": "2026-000043",
|
|
||||||
"deleted_user_ids": ["…"],
|
|
||||||
"deleted_enfant_ids": ["…"],
|
|
||||||
"message": "Dossier famille supprimé."
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
ou
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"type": "assistante_maternelle",
|
|
||||||
"numero_dossier": "2026-000015",
|
|
||||||
"deleted_user_ids": ["…"],
|
|
||||||
"deleted_enfant_ids": [],
|
|
||||||
"message": "Dossier assistante maternelle supprimé."
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Dialog UI** : lister libellé + n° + « X parent(s), Y enfant(s) » (ou « compte AM, enfants conservés »).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2. `DELETE /users/:id`
|
|
||||||
|
|
||||||
Comportement selon le **rôle** de la cible :
|
|
||||||
|
|
||||||
| Cible | Effet |
|
|
||||||
|-------|--------|
|
|
||||||
| Parent **co-parent** | Delete ce user seul |
|
|
||||||
| Parent **dernier** du dossier | Delete user + enfants du foyer |
|
|
||||||
| AM | Delete user AM + dossier AM ; enfants conservés ; placements clos |
|
|
||||||
| Gestionnaire | Admin only ; self → 403 |
|
|
||||||
| Administrateur | Self → 403 ; dernier admin → super_admin only sinon 403 ; super_admin → 403 |
|
|
||||||
|
|
||||||
**Réponse 200** :
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"deleted_user_ids": ["…"],
|
|
||||||
"deleted_enfant_ids": ["…"],
|
|
||||||
"message": "…"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Dialogs** :
|
|
||||||
|
|
||||||
- Co-parent : « Ce parent sera retiré / supprimé du dossier {n°}. Les enfants restent avec le co-parent. »
|
|
||||||
- Dernier parent : « Dernier parent du dossier {n°}. Les enfants rattachés seront aussi supprimés. »
|
|
||||||
- AM : « Le compte et le dossier AM seront supprimés. Les enfants accueillis ne seront pas supprimés. »
|
|
||||||
|
|
||||||
Optionnel (si exposé) : `GET /users/:id/suppression-impact` — sinon calculer depuis données déjà en liste / détail dossier.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 3. `DELETE /enfants/:id?deleteDossier=true|false`
|
|
||||||
|
|
||||||
- Pas dernier enfant → delete enfant (`deleteDossier` ignoré ou false).
|
|
||||||
- Dernier enfant + `deleteDossier=false` → delete enfant ; dossier famille peut passer `sans_enfant`.
|
|
||||||
- Dernier enfant + `deleteDossier=true` → cascade dossier famille (parents + enfants).
|
|
||||||
|
|
||||||
**Réponse 200** :
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"deleted_enfant_ids": ["…"],
|
|
||||||
"deleted_user_ids": ["…"],
|
|
||||||
"dossier_supprime": false,
|
|
||||||
"message": "…"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Dialog** :
|
|
||||||
|
|
||||||
- Standard : « L’enfant sera supprimé du dossier de {famille} ({n°}). »
|
|
||||||
- Dernier : proposer **deux actions** :
|
|
||||||
1. Supprimer l’enfant seulement (`deleteDossier=false`)
|
|
||||||
2. Supprimer aussi le dossier / parents (`deleteDossier=true`)
|
|
||||||
|
|
||||||
Pour savoir si dernier : compter enfants du `numero_dossier` (détail dossier ou champ impact API).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4. `GET /dossiers` — flag `sans_enfant`
|
|
||||||
|
|
||||||
Chaque item famille peut exposer :
|
|
||||||
|
|
||||||
```json
|
|
||||||
"sans_enfant": true
|
|
||||||
```
|
|
||||||
|
|
||||||
- `true` si dossier **famille** sans enfant lié.
|
|
||||||
- AM : `false` ou omis.
|
|
||||||
|
|
||||||
**UI** : badge / warning vigilance (comme `sans_responsable` / alertes AM).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## UserService (Flutter) — signatures cibles
|
|
||||||
|
|
||||||
```dart
|
|
||||||
Future<void> deleteDossier(String numeroDossier);
|
|
||||||
Future<Map<String, dynamic>> deleteUser(String userId);
|
|
||||||
Future<Map<String, dynamic>> deleteEnfant(String enfantId, {bool deleteDossier = false});
|
|
||||||
```
|
|
||||||
|
|
||||||
(Adapter le parsing au JSON réel une fois le back mergé ; en parallèle, stubber sur ce contrat.)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Fichiers front probables
|
|
||||||
|
|
||||||
- Cartes listes : `admin_user_card.dart`, `admin_enfant_user_card.dart`, cartes dossiers
|
|
||||||
- Listes : `dossiers_management_widget.dart`, `parent_managmant_widget.dart`, `enfant_management_widget.dart`, `assistante_maternelle_management_widget.dart`, `gestionnaire_management_widget.dart`, `admin_management_widget.dart`
|
|
||||||
- `user_service.dart`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Critères front (#160)
|
|
||||||
|
|
||||||
- [ ] Poubelle selon droits
|
|
||||||
- [ ] Confirmations avec impact
|
|
||||||
- [ ] Refresh après succès
|
|
||||||
- [ ] Dernier enfant : choix dossier oui/non
|
|
||||||
- [ ] Warning `sans_enfant`
|
|
||||||
- [ ] Self-admin / dernier admin gérés côté UI (masquer ou message 403)
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
# Mini-spec — Rename préfixe `Admin*` dashboard partagé (#155)
|
|
||||||
|
|
||||||
**Ticket** : **#155**
|
|
||||||
**Branche** : `feature/155-rename-admin-prefix-dashboard` (depuis `develop`)
|
|
||||||
**Décision naming** : **option C** — dossier neutre `widgets/dashboard/` + noms **sans** préfixe `Admin`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Principe
|
|
||||||
|
|
||||||
Les widgets partagés **admin + gestionnaire** ne doivent plus s’appeler `Admin*`.
|
|
||||||
On garde `Admin*` seulement là où c’est vraiment le rôle administrateur.
|
|
||||||
|
|
||||||
## Gardé `Admin*` (hors rename)
|
|
||||||
|
|
||||||
| Élément | Raison |
|
|
||||||
|---------|--------|
|
|
||||||
| `AdminManagementWidget` | Onglet **Administrateurs** |
|
|
||||||
| `screens/administrateurs/*` | `AdminDashboardScreen`, `AdminCreateDialog`, `AdminUserFormDialog` |
|
|
||||||
| `EnfantAdminModel` | Modèle API (pas un widget) — hors scope ticket |
|
|
||||||
|
|
||||||
## Renames faits
|
|
||||||
|
|
||||||
| Avant | Après |
|
|
||||||
|-------|--------|
|
|
||||||
| `widgets/admin/common/admin_child_detail_modal.dart` → `AdminChildDetailModal` | `widgets/dashboard/child_detail_modal.dart` → `ChildDetailModal` |
|
|
||||||
| `admin_am_edit_modal` → `AdminAmEditModal` | `am_edit_modal` → `AmEditModal` |
|
|
||||||
| `admin_parent_edit_modal` → `AdminParentEditModal` | `parent_edit_modal` → `ParentEditModal` |
|
|
||||||
| `admin_user_card` → `AdminUserCard` | `user_card` → `UserCard` |
|
|
||||||
| `admin_enfant_user_card` → `AdminEnfantUserCard` | `enfant_user_card` → `EnfantUserCard` |
|
|
||||||
| `admin_am_photo_frame` → `AdminAmPhotoFrame` | `am_photo_frame` → `AmPhotoFrame` |
|
|
||||||
| `admin_am_children_capacity_grid` | `am_children_capacity_grid` → `AmChildrenCapacityGrid` |
|
|
||||||
| `admin_children_affiliation_panel` | `children_affiliation_panel` → `ChildrenAffiliationPanel` |
|
|
||||||
| `admin_select_*` / `AdminSelect*` / `AdminFamilleFoyer` | `select_*` / `Select*` / `FamilleFoyer` |
|
|
||||||
| `admin_status_capsule` | `status_capsule` → `StatusCapsule` |
|
|
||||||
| `admin_list_state` → `AdminListState` | `user_list_state` → `UserListState` |
|
|
||||||
| `admin_detail_modal` → `AdminDetailModal` / `AdminDetailField` | `detail_modal` → `DetailModal` / `DetailField` |
|
|
||||||
| `dashboard_admin.dart` | `user_management_sub_bar.dart` (`DashboardUserManagementSubBar` inchangé) |
|
|
||||||
|
|
||||||
Dossier `widgets/admin/` conserve encore les panels métier (`user_management_panel`, wizards, etc.) + `AdminManagementWidget`.
|
|
||||||
|
|
||||||
**Phase 2** (même ticket #155) : déplacer ces panels → `widgets/dashboard/` — voir [155-suite-move-admin-panels-to-dashboard.md](./155-suite-move-admin-panels-to-dashboard.md).
|
|
||||||
|
|
||||||
## Hors scope
|
|
||||||
|
|
||||||
- Refonte UX modales (ticket dédié)
|
|
||||||
- Rename API / back
|
|
||||||
- Déplacer tout `widgets/admin/` → `widgets/dashboard/` (panels) — possible follow-up
|
|
||||||
|
|
||||||
## Critères
|
|
||||||
|
|
||||||
- [x] Plus de préfixe `Admin` sur les composants **partagés** listés
|
|
||||||
- [ ] Build Flutter / recette dashboard admin + gestionnaire OK
|
|
||||||
- [x] Pas de changement comportemental (rename mécanique)
|
|
||||||
@@ -1,203 +0,0 @@
|
|||||||
# Mini-spec — Déplacer les panels `widgets/admin/` → `widgets/dashboard/`
|
|
||||||
|
|
||||||
**Ticket** : **#155** (phase 2 — même ticket que le rename `Admin*`)
|
|
||||||
**Phase 1** : widgets `Admin*` → `widgets/dashboard/` (déjà sur `feature/155-rename-admin-prefix-dashboard`)
|
|
||||||
**Branche** : poursuivre / rebaser `feature/155-rename-admin-prefix-dashboard` (ou nouvelle branche depuis `develop` après merge phase 1)
|
|
||||||
**Nature** : rename / move mécanique — **zéro** changement UX / métier
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Contexte
|
|
||||||
|
|
||||||
Après la phase 1 (#155), la situation est **hybride** :
|
|
||||||
|
|
||||||
| Emplacement | Contenu |
|
|
||||||
|-------------|---------|
|
|
||||||
| `widgets/dashboard/` | Composants partagés sans préfixe `Admin*` (modales, cartes, selects, sub-bar…) |
|
|
||||||
| `widgets/admin/` | **Panels** du dashboard staff (listes, wizards, validation, shell `UserManagementPanel`…) + `AdminManagementWidget` |
|
|
||||||
|
|
||||||
Le dossier `admin/` laisse encore croire « réservé administrateur », alors que **gestionnaire** consomme les mêmes panels (`GestionnaireDashboardScreen` → `UserManagementPanel`).
|
|
||||||
|
|
||||||
Ce ticket **termine l’option C** au niveau dossier : tout le dashboard staff vit sous `widgets/dashboard/`, sauf ce qui est **vraiment** rôle admin.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Objectif
|
|
||||||
|
|
||||||
```
|
|
||||||
frontend/lib/widgets/admin/<panels & common partagés>
|
|
||||||
↓ git mv + update imports
|
|
||||||
frontend/lib/widgets/dashboard/…
|
|
||||||
```
|
|
||||||
|
|
||||||
Critère : un nouveau dev ne doit plus ouvrir `widgets/admin/` pour du code partagé admin+gestionnaire.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cible d’arborescence (proposée)
|
|
||||||
|
|
||||||
```
|
|
||||||
widgets/dashboard/
|
|
||||||
├── (déjà là #155) child_detail_modal.dart, am_edit_modal.dart, user_card.dart, …
|
|
||||||
├── user_management_panel.dart ← shell onglets
|
|
||||||
├── user_management_sub_bar.dart ← déjà déplacé #155
|
|
||||||
├── dossiers_management_widget.dart
|
|
||||||
├── dossier_list_card.dart
|
|
||||||
├── parent_management_widget.dart ← corriger le typo managmant au passage ?
|
|
||||||
├── enfant_management_widget.dart
|
|
||||||
├── assistante_maternelle_management_widget.dart
|
|
||||||
├── gestionnaire_management_widget.dart
|
|
||||||
├── pending_validation_widget.dart
|
|
||||||
├── parent_dossier_create_modal.dart
|
|
||||||
├── parent_dossier_wizard.dart
|
|
||||||
├── am_dossier_create_modal.dart
|
|
||||||
├── am_dossier_wizard.dart
|
|
||||||
├── validation_*.dart ← family/am wizards, refus, theme, confirm
|
|
||||||
├── parametres_panel.dart ← utilisé par écran admin (OK dans dashboard)
|
|
||||||
├── relais_management_panel.dart
|
|
||||||
├── common/ ← sous-dossier optionnel
|
|
||||||
│ ├── suppression_confirm_dialog.dart
|
|
||||||
│ ├── user_list.dart
|
|
||||||
│ └── validation_detail_section.dart
|
|
||||||
└── …
|
|
||||||
|
|
||||||
widgets/admin/ ← mince, rôle admin seulement
|
|
||||||
└── admin_management_widget.dart ← onglet Administrateurs
|
|
||||||
```
|
|
||||||
|
|
||||||
### Variante B (plus stricte)
|
|
||||||
|
|
||||||
`AdminManagementWidget` + éventuels helpers purement admin →
|
|
||||||
`screens/administrateurs/widgets/`
|
|
||||||
et **suppression** du dossier `widgets/admin/`.
|
|
||||||
|
|
||||||
**Reco** : **variante A** (garder `widgets/admin/` minimal avec seulement `AdminManagementWidget`) — moins de churn screens, clair.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Inventaire à déplacer (état actuel)
|
|
||||||
|
|
||||||
### Racine `widgets/admin/` → `widgets/dashboard/`
|
|
||||||
|
|
||||||
| Fichier actuel | Notes |
|
|
||||||
|----------------|--------|
|
|
||||||
| `user_management_panel.dart` | Shell partagé admin + gestionnaire |
|
|
||||||
| `dossiers_management_widget.dart` | |
|
|
||||||
| `dossier_list_card.dart` | |
|
|
||||||
| `parent_managmant_widget.dart` | Typo historique `managmant` — **option** : renommer → `parent_management_widget.dart` dans le même ticket ou ticket typo séparé |
|
|
||||||
| `enfant_management_widget.dart` | |
|
|
||||||
| `assistante_maternelle_management_widget.dart` | |
|
|
||||||
| `gestionnaire_management_widget.dart` | |
|
|
||||||
| `pending_validation_widget.dart` | |
|
|
||||||
| `parent_dossier_create_modal.dart` | |
|
|
||||||
| `parent_dossier_wizard.dart` | |
|
|
||||||
| `am_dossier_create_modal.dart` | |
|
|
||||||
| `am_dossier_wizard.dart` | |
|
|
||||||
| `validation_am_wizard.dart` | |
|
|
||||||
| `validation_family_wizard.dart` | |
|
|
||||||
| `validation_dossier_modal.dart` | |
|
|
||||||
| `validation_modal_theme.dart` | |
|
|
||||||
| `validation_refus_form.dart` | |
|
|
||||||
| `validation_valider_confirm_dialog.dart` | |
|
|
||||||
| `parametres_panel.dart` | Écran admin seulement, mais pas préfixé Admin — OK dashboard |
|
|
||||||
| `relais_management_panel.dart` | |
|
|
||||||
|
|
||||||
### `widgets/admin/common/` → `widgets/dashboard/common/` (ou plat)
|
|
||||||
|
|
||||||
| Fichier | Notes |
|
|
||||||
|---------|--------|
|
|
||||||
| `suppression_confirm_dialog.dart` | Partagé (y compris `screens/administrateurs/creation/*`) |
|
|
||||||
| `user_list.dart` | |
|
|
||||||
| `validation_detail_section.dart` | |
|
|
||||||
|
|
||||||
### **Ne pas** déplacer
|
|
||||||
|
|
||||||
| Fichier | Destination |
|
|
||||||
|---------|-------------|
|
|
||||||
| `admin_management_widget.dart` | Reste `widgets/admin/` (ou variante B → screens) |
|
|
||||||
|
|
||||||
### Déjà fait (#155) — ne pas retraiter
|
|
||||||
|
|
||||||
Tout ce qui est déjà sous `widgets/dashboard/` (`child_detail_modal`, `am_edit_modal`, `user_card`, `select_*`, `user_management_sub_bar`, …).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Consommateurs d’imports (à mettre à jour)
|
|
||||||
|
|
||||||
### Screens
|
|
||||||
- `screens/administrateurs/admin_dashboardScreen.dart` — `UserManagementPanel`, `ParametresPanel`
|
|
||||||
- `screens/gestionnaire/gestionnaire_dashboard_screen.dart` — `UserManagementPanel`
|
|
||||||
- `screens/administrateurs/creation/admin_create.dart` — `suppression_confirm_dialog`
|
|
||||||
- `screens/administrateurs/creation/gestionnaires_create.dart` — idem
|
|
||||||
|
|
||||||
### Widgets déjà en `dashboard/`
|
|
||||||
- `am_edit_modal`, `child_detail_modal`, `parent_edit_modal`, `select_*` — imports vers `widgets/admin/common/*` ou panels
|
|
||||||
|
|
||||||
### Divers
|
|
||||||
- `widgets/common/identity_block.dart` (si import admin)
|
|
||||||
- Tous les fichiers **déplacés** entre eux (imports relatifs / package)
|
|
||||||
|
|
||||||
### Hors scope rename classes
|
|
||||||
Sauf décision explicite sur le typo `parent_managmant_widget` → pas de rename de **classes** métier dans ce ticket (seulement chemins de fichiers + imports).
|
|
||||||
`AdminManagementWidget` **conserve** son nom.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Plan d’exécution
|
|
||||||
|
|
||||||
1. Partir de `feature/155-rename-admin-prefix-dashboard` (phase 1) **ou** `develop` si phase 1 déjà mergée
|
|
||||||
2. `git mv` fichiers selon inventaire
|
|
||||||
3. Remplacer globalement
|
|
||||||
`package:p_tits_pas/widgets/admin/` → `package:p_tits_pas/widgets/dashboard/`
|
|
||||||
**sauf** `…/widgets/admin/admin_management_widget.dart`
|
|
||||||
4. Corriger imports relatifs cassés
|
|
||||||
5. Grep de contrôle (ci-dessous)
|
|
||||||
6. Build Flutter web (Docker) + smoke dashboard admin **et** gestionnaire
|
|
||||||
7. Merge → squash master si flux habituel
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Vérifs
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Plus de panels partagés sous admin (seul AdminManagement attendu)
|
|
||||||
find frontend/lib/widgets/admin -name '*.dart'
|
|
||||||
|
|
||||||
# Plus d’imports panels vers l’ancien chemin (sauf AdminManagement)
|
|
||||||
rg -n "widgets/admin/(user_management|dossiers_|parent_|enfant_|assistante|gestionnaire|pending|validation_|parametres|relais|am_dossier|parent_dossier|dossier_list|common/)" frontend/lib
|
|
||||||
|
|
||||||
# Screens OK
|
|
||||||
rg -n "widgets/admin/" frontend/lib/screens
|
|
||||||
```
|
|
||||||
|
|
||||||
Attendu screens : **0** hit vers panels ; éventuellement plus aucun hit `widgets/admin/` sauf si import explicite `AdminManagementWidget` depuis `user_management_panel` (chemin `widgets/admin/admin_management_widget.dart`).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Hors scope
|
|
||||||
|
|
||||||
- Refonte UX des modales / panels (ticket dédié annoncé)
|
|
||||||
- Rename `EnfantAdminModel`
|
|
||||||
- Rename `screens/administrateurs/`
|
|
||||||
- Rename `AdminUserFormDialog` / `AdminCreateDialog`
|
|
||||||
- Changement API / back
|
|
||||||
- #152 (`est_multiple`) — autre branche
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Critères d’acceptation
|
|
||||||
|
|
||||||
- [ ] Inventaire déplacé selon tableau
|
|
||||||
- [ ] `widgets/admin/` ne contient plus que `admin_management_widget.dart` (variante A)
|
|
||||||
- [ ] Imports screens + widgets à jour
|
|
||||||
- [ ] Build Flutter OK
|
|
||||||
- [ ] Recette : dashboard **administrateur** et **gestionnaire** (listes, ouverture fiches, validation, création dossier) sans régression
|
|
||||||
- [ ] Aucun changement comportemental volontaire
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Risques / notes
|
|
||||||
|
|
||||||
- **Conflits de merge** si d’autres features touchent les panels → faire ce ticket quand la surface dashboard est calme (fin 0.1.0 OK)
|
|
||||||
- Typo `parent_managmant_widget` : soit inclus (bonus), soit ticket cleanup 1-ligne séparé
|
|
||||||
- Docs d’archive citant `widgets/admin/…` : pas obligatoire de mettre à jour ; `docs/27_BRIEFING-FRONTEND.md` oui si encore listé
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
# Mini-spec API — POST /assistantes-maternelles/dossier (#156)
|
|
||||||
|
|
||||||
Contrat pour le **plan front** (wizard création AM staff).
|
|
||||||
|
|
||||||
## Endpoint
|
|
||||||
|
|
||||||
| | |
|
|
||||||
|--|--|
|
|
||||||
| **Méthode** | `POST` |
|
|
||||||
| **URL** | `{base}/assistantes-maternelles/dossier` |
|
|
||||||
| **Auth** | Bearer JWT |
|
|
||||||
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
|
||||||
| **Content-Type** | `application/json` |
|
|
||||||
|
|
||||||
Ne **pas** appeler `POST /auth/register/am` depuis le dashboard.
|
|
||||||
|
|
||||||
## Body (JSON)
|
|
||||||
|
|
||||||
Aligné inscription AM publique, **sans** CGU/privacy obligatoires (acceptées serveur).
|
|
||||||
|
|
||||||
| Champ | Type | Obligatoire | Notes |
|
|
||||||
|-------|------|-------------|--------|
|
|
||||||
| `email` | string | oui | unique |
|
|
||||||
| `prenom` | string | oui | |
|
|
||||||
| `nom` | string | oui | |
|
|
||||||
| `telephone` | string | oui | `0X…` ou `+33…` |
|
|
||||||
| `adresse` | string | non | |
|
|
||||||
| `code_postal` | string | non | |
|
|
||||||
| `ville` | string | non | |
|
|
||||||
| `photo_base64` | string | non | data-URL `data:image/…;base64,…` |
|
|
||||||
| `photo_filename` | string | non | hint nom fichier |
|
|
||||||
| `consentement_photo` | bool | oui | |
|
|
||||||
| `date_naissance` | date ISO | non | `YYYY-MM-DD` |
|
|
||||||
| `lieu_naissance_ville` | string | oui | |
|
|
||||||
| `lieu_naissance_pays` | string | oui | |
|
|
||||||
| `nir` | string | oui | 15 car. (Corse 2A/2B OK) |
|
|
||||||
| `numero_agrement` | string | oui | unique |
|
|
||||||
| `date_agrement` | date ISO | non | |
|
|
||||||
| `capacite_accueil` | int | oui | 1–10 |
|
|
||||||
| `places_disponibles` | int | oui | 0–10, ≤ capacité |
|
|
||||||
| `biographie` | string | non | max 2000 |
|
|
||||||
|
|
||||||
## Réponses
|
|
||||||
|
|
||||||
### 201 Created
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"message": "Dossier AM créé et validé. Un e-mail de création de mot de passe a été envoyé.",
|
|
||||||
"user_id": "uuid",
|
|
||||||
"statut": "actif",
|
|
||||||
"numero_dossier": "2026-000042"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Effets serveur : user AM **actif**, fiche `assistantes_maternelles`, n° dossier, **e-mail création MDP** (pas d’accusé « en attente »).
|
|
||||||
|
|
||||||
### Erreurs
|
|
||||||
|
|
||||||
| Code | Cas |
|
|
||||||
|------|-----|
|
|
||||||
| 400 | Validation / NIR / places > capacité |
|
|
||||||
| 403 | Rôle non staff |
|
|
||||||
| 409 | Email, NIR ou agrément déjà pris |
|
|
||||||
| 401 | Token manquant / invalide |
|
|
||||||
|
|
||||||
## Front
|
|
||||||
|
|
||||||
- `UserService.createAmDossier(body)` → cet endpoint
|
|
||||||
- Après 201 : refresh liste AM ; snackbar OK
|
|
||||||
- Wizard create : ne pas envoyer `acceptation_cgu` / `acceptation_privacy` (optionnels)
|
|
||||||
|
|
||||||
## Branche
|
|
||||||
|
|
||||||
`feature/156-creation-dossier-am`
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
# Mini-spec — Uniformisation modale staff (Gestionnaire / Administrateur)
|
|
||||||
|
|
||||||
**Ticket** : **#164** — https://git.ptits-pas.fr/jmartin/petitspas/issues/164
|
|
||||||
**Branche** : `feature/164-staff-modal-uniformisation` (depuis `develop`)
|
|
||||||
**Périmètre** : **front only** — pas d’API / BDD
|
|
||||||
**Milestone** : **0.1.0**
|
|
||||||
|
|
||||||
Voir le corps du ticket #164 pour la spec complète.
|
|
||||||
|
|
||||||
## Livré
|
|
||||||
|
|
||||||
- `frontend/lib/widgets/dashboard/staff_user_form_modal.dart` → `StaffUserFormModal`
|
|
||||||
- Ancien `AdminUserFormDialog` / `gestionnaires_create.dart` retiré
|
|
||||||
- Imports : `user_management_panel`, `gestionnaire_management_widget`, `admin_management_widget`
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<application
|
<application
|
||||||
android:label="p_tits_pas"
|
android:label="p_tits_pas"
|
||||||
android:name="${applicationName}"
|
android:name="${applicationName}"
|
||||||
android:icon="@mipmap/ic_launcher">
|
android:icon="@mipmap/launcher_icon">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
|
|||||||
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 216 KiB |
|
After Width: | Height: | Size: 249 KiB |
|
After Width: | Height: | Size: 277 KiB |
|
After Width: | Height: | Size: 171 KiB |
|
After Width: | Height: | Size: 290 KiB |
|
After Width: | Height: | Size: 239 KiB |
|
After Width: | Height: | Size: 441 KiB |
|
After Width: | Height: | Size: 169 KiB |
|
After Width: | Height: | Size: 223 KiB |
|
After Width: | Height: | Size: 253 KiB |
|
After Width: | Height: | Size: 217 KiB |
|
After Width: | Height: | Size: 289 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 41 KiB |
@@ -0,0 +1,58 @@
|
|||||||
|
class AbsenceGarde {
|
||||||
|
final String id;
|
||||||
|
final String idPlacement;
|
||||||
|
final String type;
|
||||||
|
final String dateDebut;
|
||||||
|
final String dateFin;
|
||||||
|
final String statut;
|
||||||
|
final String expireAt;
|
||||||
|
final String? creePar;
|
||||||
|
final String? motif;
|
||||||
|
final String? idEnfant;
|
||||||
|
final String? prenomEnfant;
|
||||||
|
final String? idAm;
|
||||||
|
final String? prenomAm;
|
||||||
|
final String? nomAm;
|
||||||
|
final String creeLe;
|
||||||
|
final String modifieLe;
|
||||||
|
|
||||||
|
AbsenceGarde({
|
||||||
|
required this.id,
|
||||||
|
required this.idPlacement,
|
||||||
|
required this.type,
|
||||||
|
required this.dateDebut,
|
||||||
|
required this.dateFin,
|
||||||
|
required this.statut,
|
||||||
|
required this.expireAt,
|
||||||
|
this.creePar,
|
||||||
|
this.motif,
|
||||||
|
this.idEnfant,
|
||||||
|
this.prenomEnfant,
|
||||||
|
this.idAm,
|
||||||
|
this.prenomAm,
|
||||||
|
this.nomAm,
|
||||||
|
required this.creeLe,
|
||||||
|
required this.modifieLe,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory AbsenceGarde.fromJson(Map<String, dynamic> json) {
|
||||||
|
return AbsenceGarde(
|
||||||
|
id: json['id'] ?? '',
|
||||||
|
idPlacement: json['id_placement'] ?? '',
|
||||||
|
type: json['type'] ?? '',
|
||||||
|
dateDebut: json['date_debut'] ?? '',
|
||||||
|
dateFin: json['date_fin'] ?? '',
|
||||||
|
statut: json['statut'] ?? '',
|
||||||
|
expireAt: json['expire_at'] ?? '',
|
||||||
|
creePar: json['cree_par'],
|
||||||
|
motif: json['motif'],
|
||||||
|
idEnfant: json['id_enfant'],
|
||||||
|
prenomEnfant: json['prenom_enfant'],
|
||||||
|
idAm: json['id_am'],
|
||||||
|
prenomAm: json['prenom_am'],
|
||||||
|
nomAm: json['nom_am'],
|
||||||
|
creeLe: json['cree_le'] ?? '',
|
||||||
|
modifieLe: json['modifie_le'] ?? '',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,41 +1,37 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:p_tits_pas/controllers/parent_dashboard_controller.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/dashboardService.dart';
|
import 'package:p_tits_pas/services/couple_garde_service.dart';
|
||||||
import 'package:p_tits_pas/widgets/app_footer.dart';
|
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
|
||||||
import 'package:p_tits_pas/widgets/dashbord_parent/children_sidebar.dart';
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
|
||||||
import 'package:p_tits_pas/widgets/dashbord_parent/wid_dashbord.dart';
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
import 'package:p_tits_pas/widgets/dashboard/dashboard_bandeau.dart';
|
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
|
||||||
import 'package:p_tits_pas/widgets/main_content_area.dart';
|
|
||||||
import 'package:p_tits_pas/widgets/messaging_sidebar.dart';
|
|
||||||
import 'package:provider/provider.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 {
|
class ParentDashboardScreen extends StatefulWidget {
|
||||||
const ParentDashboardScreen({Key? key}) : super(key: key);
|
const ParentDashboardScreen({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<ParentDashboardScreen> createState() => _ParentDashboardScreenState();
|
State<ParentDashboardScreen> createState() => _ParentDashboardScreenState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
||||||
int selectedIndex = 0;
|
QuotidienNavSection _section = QuotidienNavSection.liaison;
|
||||||
AppUser? _user;
|
AppUser? _user;
|
||||||
|
|
||||||
void onTabChange(int index) {
|
List<CoupleGarde> _couples = const [];
|
||||||
setState(() {
|
String? _selectedCoupleId;
|
||||||
selectedIndex = index;
|
bool _couplesLoading = true;
|
||||||
});
|
String? _couplesError;
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_loadUser();
|
_loadUser();
|
||||||
// Initialiser les données du dashboard
|
_loadCouples();
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
||||||
context.read<ParentDashboardController>().initDashboard();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _loadUser() async {
|
Future<void> _loadUser() async {
|
||||||
@@ -43,218 +39,145 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
if (mounted) setState(() => _user = user);
|
if (mounted) setState(() => _user = user);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _getBody() {
|
Future<void> _loadCouples() async {
|
||||||
switch (selectedIndex) {
|
setState(() {
|
||||||
case 0:
|
_couplesLoading = true;
|
||||||
return Dashbord_body();
|
_couplesError = null;
|
||||||
case 1:
|
});
|
||||||
return const Center(child: Text("🔍 Trouver une nounou"));
|
try {
|
||||||
case 2:
|
final res = await CoupleGardeService.getCouplesGarde();
|
||||||
return const Center(child: Text("⚙️ Paramètres"));
|
if (!mounted) return;
|
||||||
default:
|
setState(() {
|
||||||
return const Center(child: Text("Page non trouvée"));
|
_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;
|
||||||
|
final email = _user?.email.trim() ?? '';
|
||||||
|
if (email.isNotEmpty) return email.split('@').first;
|
||||||
|
return 'Parent';
|
||||||
|
}
|
||||||
|
|
||||||
|
void _soon(String label) {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(content: Text('$label — à venir')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return ChangeNotifierProvider(
|
return QuotidienShell(
|
||||||
create: (context) => ParentDashboardController(DashboardService())..initDashboard(),
|
selectedSection: _section,
|
||||||
child: Scaffold(
|
onSectionSelected: (s) => setState(() => _section = s),
|
||||||
appBar: PreferredSize(
|
userDisplayName: _displayName,
|
||||||
preferredSize: const Size.fromHeight(60.0),
|
userEmail: _user?.email,
|
||||||
child: DashboardBandeau(
|
onProfileTap: () => _soon('Profil'),
|
||||||
tabItems: const [
|
onSearchAmTap: () => _soon('Recherche AM'),
|
||||||
DashboardTabItem(label: 'Mon tableau de bord'),
|
onSettingsTap: () => _soon('Paramètres'),
|
||||||
DashboardTabItem(label: 'Trouver une nounou'),
|
leftColumn: _LeftColumn(
|
||||||
DashboardTabItem(label: 'Paramètres'),
|
couples: _couples,
|
||||||
],
|
selectedCoupleId: _selectedCoupleId,
|
||||||
selectedTabIndex: selectedIndex,
|
loading: _couplesLoading,
|
||||||
onTabSelected: onTabChange,
|
error: _couplesError,
|
||||||
userDisplayName: _user?.fullName.isNotEmpty == true
|
onRetry: _loadCouples,
|
||||||
? _user!.fullName
|
onCoupleSelected: _selectCouple,
|
||||||
: 'Parent',
|
),
|
||||||
userEmail: _user?.email,
|
centerColumn: const QuotidienColumnPlaceholder(
|
||||||
userRole: _user?.role,
|
title: 'Blog',
|
||||||
onProfileTap: () {
|
subtitle:
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
'Fil du quotidien (affichage par défaut)\n(à brancher — ticket #178).',
|
||||||
const SnackBar(
|
icon: Icons.auto_stories_outlined,
|
||||||
content: Text('Modification du profil – à venir')),
|
),
|
||||||
);
|
rightColumn: const QuotidienColumnPlaceholder(
|
||||||
},
|
title: 'Messagerie',
|
||||||
onSettingsTap: () {
|
subtitle:
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
|
||||||
const SnackBar(content: Text('Paramètres – à venir')),
|
icon: Icons.chat_bubble_outline,
|
||||||
);
|
),
|
||||||
},
|
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
|
||||||
onLogout: () {},
|
contratBody: const QuotidienStubPage(
|
||||||
showLogoutConfirmation: true,
|
title: 'Contrat',
|
||||||
),
|
message: 'Contrat — contenu à venir (stub #187).',
|
||||||
),
|
|
||||||
body: Column(
|
|
||||||
children: [
|
|
||||||
Expanded(child: _getBody()),
|
|
||||||
const AppFooter(),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Widget _buildResponsiveBody(BuildContext context, ParentDashboardController controller) {
|
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173 à venir).
|
||||||
return LayoutBuilder(
|
class _LeftColumn extends StatelessWidget {
|
||||||
builder: (context, constraints) {
|
final List<CoupleGarde> couples;
|
||||||
if (constraints.maxWidth < 768) {
|
final String? selectedCoupleId;
|
||||||
// Layout mobile : colonnes empilées
|
final bool loading;
|
||||||
return _buildMobileLayout(controller);
|
final String? error;
|
||||||
} else if (constraints.maxWidth < 1024) {
|
final VoidCallback onRetry;
|
||||||
// Layout tablette : 2 colonnes
|
final ValueChanged<CoupleGarde> onCoupleSelected;
|
||||||
return _buildTabletLayout(controller);
|
|
||||||
} else {
|
|
||||||
// Layout desktop : 3 colonnes
|
|
||||||
return _buildDesktopLayout(controller);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildDesktopLayout(ParentDashboardController controller) {
|
const _LeftColumn({
|
||||||
return Row(
|
required this.couples,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
required this.selectedCoupleId,
|
||||||
children: [
|
required this.loading,
|
||||||
// Sidebar gauche - Enfants
|
required this.error,
|
||||||
SizedBox(
|
required this.onRetry,
|
||||||
width: 280,
|
required this.onCoupleSelected,
|
||||||
child: ChildrenSidebar(
|
});
|
||||||
children: controller.children,
|
|
||||||
selectedChildId: controller.selectedChildId,
|
|
||||||
onChildSelected: controller.selectChild,
|
|
||||||
onAddChild: controller.showAddChildModal,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// Contenu central
|
@override
|
||||||
Expanded(
|
Widget build(BuildContext context) {
|
||||||
flex: 2,
|
return Padding(
|
||||||
child: MainContentArea(
|
padding: const EdgeInsets.all(14),
|
||||||
selectedChild: controller.selectedChild,
|
|
||||||
selectedAssistant: controller.selectedAssistant,
|
|
||||||
events: controller.upcomingEvents,
|
|
||||||
contracts: controller.contracts,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// Sidebar droite - Messagerie
|
|
||||||
SizedBox(
|
|
||||||
width: 320,
|
|
||||||
child: MessagingSidebar(
|
|
||||||
conversations: controller.conversations,
|
|
||||||
notifications: controller.notifications,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildTabletLayout(ParentDashboardController controller) {
|
|
||||||
return Row(
|
|
||||||
children: [
|
|
||||||
// Sidebar enfants plus étroite
|
|
||||||
SizedBox(
|
|
||||||
width: 240,
|
|
||||||
child: ChildrenSidebar(
|
|
||||||
children: controller.children,
|
|
||||||
selectedChildId: controller.selectedChildId,
|
|
||||||
onChildSelected: controller.selectChild,
|
|
||||||
onAddChild: controller.showAddChildModal,
|
|
||||||
isCompact: true,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// Contenu principal avec messagerie intégrée
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
flex: 2,
|
|
||||||
child: MainContentArea(
|
|
||||||
selectedChild: controller.selectedChild,
|
|
||||||
selectedAssistant: controller.selectedAssistant,
|
|
||||||
events: controller.upcomingEvents,
|
|
||||||
contracts: controller.contracts,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
height: 200,
|
|
||||||
child: MessagingSidebar(
|
|
||||||
conversations: controller.conversations,
|
|
||||||
notifications: controller.notifications,
|
|
||||||
isCompact: true,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildMobileLayout(ParentDashboardController controller) {
|
|
||||||
return DefaultTabController(
|
|
||||||
length: 4,
|
|
||||||
child: Column(
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
children: [
|
children: [
|
||||||
// Navigation par onglets sur mobile
|
CoupleSelectorBandeau(
|
||||||
Container(
|
couples: couples,
|
||||||
color: Theme.of(context).primaryColor.withOpacity(0.1),
|
selectedCoupleId: selectedCoupleId,
|
||||||
child: const TabBar(
|
loading: loading,
|
||||||
isScrollable: true,
|
errorMessage: error,
|
||||||
tabs: [
|
onRetry: onRetry,
|
||||||
Tab(text: 'Enfants', icon: Icon(Icons.child_care)),
|
onCoupleSelected: onCoupleSelected,
|
||||||
Tab(text: 'Planning', icon: Icon(Icons.calendar_month)),
|
|
||||||
Tab(text: 'Contrats', icon: Icon(Icons.description)),
|
|
||||||
Tab(text: 'Messages', icon: Icon(Icons.message)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: 14),
|
||||||
Expanded(
|
const Expanded(
|
||||||
child: TabBarView(
|
child: QuotidienColumnPlaceholder(
|
||||||
children: [
|
title: 'Cartes',
|
||||||
// Onglet Enfants
|
subtitle:
|
||||||
ChildrenSidebar(
|
'Absences, congés AM, sorties à valider\n(à brancher — ticket #173).',
|
||||||
children: controller.children,
|
icon: Icons.style_outlined,
|
||||||
selectedChildId: controller.selectedChildId,
|
|
||||||
onChildSelected: controller.selectChild,
|
|
||||||
onAddChild: controller.showAddChildModal,
|
|
||||||
isMobile: true,
|
|
||||||
),
|
|
||||||
|
|
||||||
// Onglet Planning
|
|
||||||
MainContentArea(
|
|
||||||
selectedChild: controller.selectedChild,
|
|
||||||
selectedAssistant: controller.selectedAssistant,
|
|
||||||
events: controller.upcomingEvents,
|
|
||||||
contracts: controller.contracts,
|
|
||||||
showOnlyCalendar: true,
|
|
||||||
),
|
|
||||||
|
|
||||||
// Onglet Contrats
|
|
||||||
MainContentArea(
|
|
||||||
selectedChild: controller.selectedChild,
|
|
||||||
selectedAssistant: controller.selectedAssistant,
|
|
||||||
events: controller.upcomingEvents,
|
|
||||||
contracts: controller.contracts,
|
|
||||||
showOnlyContracts: true,
|
|
||||||
),
|
|
||||||
|
|
||||||
// Onglet Messages
|
|
||||||
MessagingSidebar(
|
|
||||||
conversations: controller.conversations,
|
|
||||||
notifications: controller.notifications,
|
|
||||||
isMobile: true,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -0,0 +1,192 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:p_tits_pas/models/absence_garde.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/absences_garde_service.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
|
|
||||||
|
class AgendaAbsencesStub extends StatefulWidget {
|
||||||
|
final String? placementId;
|
||||||
|
|
||||||
|
const AgendaAbsencesStub({super.key, this.placementId});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<AgendaAbsencesStub> createState() => _AgendaAbsencesStubState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AgendaAbsencesStubState extends State<AgendaAbsencesStub> {
|
||||||
|
List<AbsenceGarde> _absences = [];
|
||||||
|
bool _loading = true;
|
||||||
|
String? _error;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_loadAbsences();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(covariant AgendaAbsencesStub oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.placementId != widget.placementId) {
|
||||||
|
_loadAbsences();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _loadAbsences() async {
|
||||||
|
setState(() {
|
||||||
|
_loading = true;
|
||||||
|
_error = null;
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
final absences = await AbsencesGardeService.getAbsences(
|
||||||
|
placementId: widget.placementId,
|
||||||
|
);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_absences = absences;
|
||||||
|
_loading = false;
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_error = e.toString();
|
||||||
|
_loading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Container(
|
||||||
|
color: QuotidienTheme.ivory,
|
||||||
|
child: Center(
|
||||||
|
child: ConstrainedBox(
|
||||||
|
constraints: const BoxConstraints(maxWidth: 600),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
const Icon(
|
||||||
|
Icons.calendar_month_outlined,
|
||||||
|
size: 64,
|
||||||
|
color: QuotidienTheme.peach,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Text(
|
||||||
|
"Agenda (Stub) - Lignes d'absence",
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
Text(
|
||||||
|
'ID Placement courant: ${widget.placementId ?? 'Tous'}',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: const TextStyle(color: QuotidienTheme.muted),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Expanded(
|
||||||
|
child: _buildList(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildList() {
|
||||||
|
if (_loading) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
if (_error != null) {
|
||||||
|
return Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.error_outline, color: Colors.red, size: 48),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Text(_error!, style: const TextStyle(color: Colors.red)),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: _loadAbsences,
|
||||||
|
child: const Text('Réessayer'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (_absences.isEmpty) {
|
||||||
|
return const Center(
|
||||||
|
child: Text('Aucune absence ou congé trouvé.',
|
||||||
|
style: TextStyle(color: QuotidienTheme.muted)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return ListView.separated(
|
||||||
|
itemCount: _absences.length,
|
||||||
|
separatorBuilder: (_, __) => const Divider(),
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final abs = _absences[index];
|
||||||
|
return ListTile(
|
||||||
|
leading: _getIcon(abs.type),
|
||||||
|
title: Text('${abs.type} (${abs.statut})'),
|
||||||
|
subtitle: Text(
|
||||||
|
'Du ${abs.dateDebut} au ${abs.dateFin}\n'
|
||||||
|
'Enfant: ${abs.prenomEnfant ?? 'N/A'}, AM: ${abs.prenomAm ?? 'N/A'}',
|
||||||
|
),
|
||||||
|
trailing: IconButton(
|
||||||
|
icon: const Icon(Icons.delete_outline, color: Colors.red),
|
||||||
|
onPressed: () => _confirmDelete(abs),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Icon _getIcon(String type) {
|
||||||
|
switch (type) {
|
||||||
|
case 'absence_enfant':
|
||||||
|
return const Icon(Icons.child_care, color: QuotidienTheme.coral);
|
||||||
|
case 'conge_am':
|
||||||
|
return const Icon(Icons.beach_access, color: QuotidienTheme.turquoise);
|
||||||
|
case 'arret_maladie_am':
|
||||||
|
return const Icon(Icons.medical_services, color: QuotidienTheme.coral);
|
||||||
|
default:
|
||||||
|
return const Icon(Icons.event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _confirmDelete(AbsenceGarde abs) async {
|
||||||
|
final confirm = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Text('Supprimer ?'),
|
||||||
|
content: Text("Supprimer l'absence ${abs.type} du ${abs.dateDebut} ?"),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context, false),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context, true),
|
||||||
|
style: TextButton.styleFrom(foregroundColor: Colors.red),
|
||||||
|
child: const Text('Supprimer'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (confirm == true) {
|
||||||
|
try {
|
||||||
|
await AbsencesGardeService.supprimerAbsence(abs.id);
|
||||||
|
_loadAbsences();
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(content: Text('Erreur: $e')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:p_tits_pas/models/absence_garde.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/tokenService.dart';
|
||||||
|
|
||||||
|
class AbsencesGardeService {
|
||||||
|
static Future<List<AbsenceGarde>> getAbsences({String? placementId}) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse(ApiConfig.baseUrl +
|
||||||
|
'/absences-garde' +
|
||||||
|
(placementId != null ? '?placementId=$placementId' : ''));
|
||||||
|
|
||||||
|
final res = await http.get(uri, headers: headers);
|
||||||
|
if (res.statusCode == 200) {
|
||||||
|
final json = jsonDecode(res.body);
|
||||||
|
final List items = json['items'] ?? [];
|
||||||
|
return items.map((e) => AbsenceGarde.fromJson(e)).toList();
|
||||||
|
} else {
|
||||||
|
throw Exception('Erreur de chargement des absences : ${res.statusCode}');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<AbsenceGarde> creerAbsence({
|
||||||
|
required String idPlacement,
|
||||||
|
required String type,
|
||||||
|
required String dateDebut,
|
||||||
|
required String dateFin,
|
||||||
|
String? motif,
|
||||||
|
}) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde');
|
||||||
|
final res = await http.post(
|
||||||
|
uri,
|
||||||
|
headers: headers,
|
||||||
|
body: jsonEncode({
|
||||||
|
'id_placement': idPlacement,
|
||||||
|
'type': type,
|
||||||
|
'date_debut': dateDebut,
|
||||||
|
'date_fin': dateFin,
|
||||||
|
if (motif != null) 'motif': motif,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
if (res.statusCode == 201) {
|
||||||
|
return AbsenceGarde.fromJson(jsonDecode(res.body));
|
||||||
|
} else {
|
||||||
|
throw Exception("Erreur de création d'absence : ${res.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<AbsenceGarde> modifierAbsence(
|
||||||
|
String id, {
|
||||||
|
String? dateDebut,
|
||||||
|
String? dateFin,
|
||||||
|
String? statut,
|
||||||
|
String? motif,
|
||||||
|
}) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||||
|
final Map<String, dynamic> body = {};
|
||||||
|
if (dateDebut != null) body['date_debut'] = dateDebut;
|
||||||
|
if (dateFin != null) body['date_fin'] = dateFin;
|
||||||
|
if (statut != null) body['statut'] = statut;
|
||||||
|
if (motif != null) body['motif'] = motif;
|
||||||
|
|
||||||
|
final res = await http.patch(
|
||||||
|
uri,
|
||||||
|
headers: headers,
|
||||||
|
body: jsonEncode(body),
|
||||||
|
);
|
||||||
|
if (res.statusCode == 200) {
|
||||||
|
return AbsenceGarde.fromJson(jsonDecode(res.body));
|
||||||
|
} else {
|
||||||
|
throw Exception("Erreur de modification d'absence : ${res.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<void> supprimerAbsence(String id) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||||
|
final res = await http.delete(uri, headers: headers);
|
||||||
|
if (res.statusCode != 204) {
|
||||||
|
throw Exception("Erreur de suppression d'absence : ${res.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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 =
|
||||||
@@ -92,7 +96,8 @@ class ApiConfig {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static Map<String, String> authHeaders(String token) => {
|
static Map<String, String> authHeaders(String token) => {
|
||||||
...headers,
|
'Content-Type': 'application/json',
|
||||||
|
'Accept': 'application/json',
|
||||||
'Authorization': 'Bearer $token',
|
'Authorization': 'Bearer $token',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||