Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d61e34a1e6 | ||
|
|
484fb9a3e5 | ||
|
|
72982f792b | ||
|
|
32f6eeeeed | ||
|
|
8b1c4555ad | ||
|
|
f978e65dfd | ||
|
|
6683139429 | ||
|
|
da12418aa0 | ||
|
|
8c778d1a6d | ||
|
|
1d68f86b3e | ||
|
|
2a24c0a061 | ||
|
|
07d3160bff | ||
|
|
bace0edd96 | ||
|
|
e267cdf8bc | ||
|
|
9c021c56b3 | ||
|
|
c922421919 | ||
|
|
e91468616b | ||
|
|
1f985f5b37 | ||
|
|
7705a14bb5 | ||
|
|
535af3b146 | ||
|
|
2832499d3e | ||
|
|
676e22665a | ||
|
|
5eb0f13e75 | ||
|
|
2c461abc82 | ||
|
|
42163826fe | ||
|
|
7ff169d4c9 | ||
|
|
ebf77b1ebb | ||
|
|
d53682110d | ||
|
|
290d442123 | ||
|
|
2114748d44 | ||
|
|
0842f66df8 | ||
|
|
c3fd098464 | ||
|
|
ed3546d196 | ||
|
|
da6836cda3 | ||
|
|
91f2c3e1ef | ||
|
|
4007d7010e | ||
|
|
4261667198 | ||
|
|
15e2d8d850 | ||
|
|
34a516d509 | ||
|
|
da71803852 | ||
|
|
2380aa9826 | ||
|
|
c952113099 | ||
|
|
8204669ec9 | ||
|
|
76ab0f340a | ||
|
|
a0a5e15b04 | ||
|
|
823ea6cd22 | ||
|
|
dfac075a74 | ||
|
|
2d8b857a84 | ||
|
|
147051821a |
@@ -16,7 +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 { EvenementsAgendaModule } from './modules/evenements-agenda';
|
||||||
|
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';
|
||||||
@@ -57,7 +58,8 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
|||||||
AuthModule,
|
AuthModule,
|
||||||
AppConfigModule,
|
AppConfigModule,
|
||||||
DocumentsLegauxModule,
|
DocumentsLegauxModule,
|
||||||
AbsencesGardeModule,
|
EvenementsAgendaModule,
|
||||||
|
CardsModule,
|
||||||
RelaisModule,
|
RelaisModule,
|
||||||
DossiersModule,
|
DossiersModule,
|
||||||
SuppressionsModule,
|
SuppressionsModule,
|
||||||
|
|||||||
@@ -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 { EvenementsAgenda } from './evenements_agenda.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_evenement', type: 'uuid', nullable: true })
|
||||||
|
id_evenement?: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => EvenementsAgenda, { nullable: true, onDelete: 'SET NULL' })
|
||||||
|
@JoinColumn({ name: 'id_evenement', referencedColumnName: 'id' })
|
||||||
|
evenement?: EvenementsAgenda;
|
||||||
|
|
||||||
|
@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;
|
||||||
|
}
|
||||||
@@ -10,25 +10,25 @@ import {
|
|||||||
import { AmChildren } from './am_children.entity';
|
import { AmChildren } from './am_children.entity';
|
||||||
import { Users } from './users.entity';
|
import { Users } from './users.entity';
|
||||||
|
|
||||||
export enum TypeAbsenceGardeType {
|
export enum TypeEvenementAgendaType {
|
||||||
ABSENCE_ENFANT = 'absence_enfant',
|
ABSENCE_ENFANT = 'absence_enfant',
|
||||||
CONGE_AM = 'conge_am',
|
CONGE_AM = 'conge_am',
|
||||||
ARRET_MALADIE_AM = 'arret_maladie_am',
|
ARRET_MALADIE_AM = 'arret_maladie_am',
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum StatutAbsenceGardeType {
|
export enum StatutEvenementAgendaType {
|
||||||
EN_ATTENTE = 'en_attente',
|
EN_ATTENTE = 'en_attente',
|
||||||
ACCEPTE = 'accepte',
|
ACCEPTE = 'accepte',
|
||||||
REFUSE = 'refuse',
|
REFUSE = 'refuse',
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Vérité métier des absences / congés / arrêts par couple AM↔enfant.
|
* Vérité métier agenda par couple AM↔enfant (placement).
|
||||||
* Les cartes (module ultérieur) collectent ; cette table stocke.
|
* Types V1 : absences / congés / arrêts ; extensible (soins, école, mairie…).
|
||||||
* Ticket #193.
|
* Les cartes collectent ; cette table historise. Ticket #205.
|
||||||
*/
|
*/
|
||||||
@Entity('absences_garde', { schema: 'public' })
|
@Entity('evenements_agenda', { schema: 'public' })
|
||||||
export class AbsencesGarde {
|
export class EvenementsAgenda {
|
||||||
@PrimaryGeneratedColumn('uuid')
|
@PrimaryGeneratedColumn('uuid')
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
@@ -41,11 +41,11 @@ export class AbsencesGarde {
|
|||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
type: 'enum',
|
type: 'enum',
|
||||||
enum: TypeAbsenceGardeType,
|
enum: TypeEvenementAgendaType,
|
||||||
enumName: 'type_absence_garde_type',
|
enumName: 'type_evenement_agenda_type',
|
||||||
name: 'type',
|
name: 'type',
|
||||||
})
|
})
|
||||||
type: TypeAbsenceGardeType;
|
type: TypeEvenementAgendaType;
|
||||||
|
|
||||||
@Column({ name: 'date_debut', type: 'date' })
|
@Column({ name: 'date_debut', type: 'date' })
|
||||||
date_debut: string;
|
date_debut: string;
|
||||||
@@ -55,12 +55,12 @@ export class AbsencesGarde {
|
|||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
type: 'enum',
|
type: 'enum',
|
||||||
enum: StatutAbsenceGardeType,
|
enum: StatutEvenementAgendaType,
|
||||||
enumName: 'statut_absence_garde_type',
|
enumName: 'statut_evenement_agenda_type',
|
||||||
name: 'statut',
|
name: 'statut',
|
||||||
default: StatutAbsenceGardeType.EN_ATTENTE,
|
default: StatutEvenementAgendaType.EN_ATTENTE,
|
||||||
})
|
})
|
||||||
statut: StatutAbsenceGardeType;
|
statut: StatutEvenementAgendaType;
|
||||||
|
|
||||||
/** Purge auto pour en_attente/refuse ; accepte → infinity. */
|
/** Purge auto pour en_attente/refuse ; accepte → infinity. */
|
||||||
@Column({ name: 'expire_at', type: 'timestamptz' })
|
@Column({ name: 'expire_at', type: 'timestamptz' })
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import { Module } from '@nestjs/common';
|
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
|
||||||
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
|
||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
|
||||||
import { AbsencesGardeController } from './absences-garde.controller';
|
|
||||||
import { AbsencesGardeService } from './absences-garde.service';
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [
|
|
||||||
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
|
||||||
],
|
|
||||||
controllers: [AbsencesGardeController],
|
|
||||||
providers: [AbsencesGardeService],
|
|
||||||
exports: [AbsencesGardeService],
|
|
||||||
})
|
|
||||||
export class AbsencesGardeModule {}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
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 evenements_agenda) — #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 { EvenementsAgendaModule } from '../evenements-agenda';
|
||||||
|
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: [
|
||||||
|
EvenementsAgendaModule,
|
||||||
|
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,158 @@
|
|||||||
|
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 { EvenementsAgendaService } from '../evenements-agenda/evenements-agenda.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 { StatutEvenementAgendaType, TypeEvenementAgendaType } from 'src/entities/evenements_agenda.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 evenementsService = {
|
||||||
|
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: EvenementsAgendaService, useValue: evenementsService },
|
||||||
|
{ 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,
|
||||||
|
});
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
evenementsService.creer.mockResolvedValue({
|
||||||
|
id: 'abs-1',
|
||||||
|
type: TypeEvenementAgendaType.CONGE_AM,
|
||||||
|
statut: StatutEvenementAgendaType.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_evenement: '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',
|
||||||
|
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(evenementsService.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,509 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { IsNull, Repository } from 'typeorm';
|
||||||
|
import { EvenementsAgendaService } from '../evenements-agenda/evenements-agenda.service';
|
||||||
|
import {
|
||||||
|
StatutEvenementAgendaType,
|
||||||
|
TypeEvenementAgendaType,
|
||||||
|
} from 'src/entities/evenements_agenda.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 evenementsService: EvenementsAgendaService,
|
||||||
|
private readonly realtime: CardsRealtimeService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async listerTypes(role: RoleType): Promise<
|
||||||
|
Pick<
|
||||||
|
CardType,
|
||||||
|
| 'code'
|
||||||
|
| 'system'
|
||||||
|
| 'titre'
|
||||||
|
| 'emitter_roles'
|
||||||
|
| 'recipient_roles'
|
||||||
|
| 'audience_resolver'
|
||||||
|
| 'response_mode'
|
||||||
|
| 'retention_days'
|
||||||
|
>[]
|
||||||
|
> {
|
||||||
|
const all = await this.typesRepo.find({ where: { system: true } });
|
||||||
|
return all
|
||||||
|
.filter((t) => t.emitter_roles.includes(role))
|
||||||
|
.map((t) => ({
|
||||||
|
code: t.code,
|
||||||
|
system: t.system,
|
||||||
|
titre: t.titre,
|
||||||
|
emitter_roles: t.emitter_roles,
|
||||||
|
recipient_roles: t.recipient_roles,
|
||||||
|
audience_resolver: t.audience_resolver,
|
||||||
|
response_mode: t.response_mode,
|
||||||
|
retention_days: t.retention_days,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
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_evenement;
|
||||||
|
const absenceType = this.mapAbsenceType(dto.type_code);
|
||||||
|
|
||||||
|
if (operation === CardOperationType.CREATE) {
|
||||||
|
const absence = await this.evenementsService.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_evenement requis pour operation=update');
|
||||||
|
}
|
||||||
|
await this.evenementsService.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: StatutEvenementAgendaType.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_evenement: 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.insert({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: userId,
|
||||||
|
action: dto.action,
|
||||||
|
comment: dto.comment?.trim() || undefined,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (card.id_evenement) {
|
||||||
|
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
||||||
|
await this.evenementsService.maj(userId, role, card.id_evenement, {
|
||||||
|
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||||
|
});
|
||||||
|
card.statut = CardInstanceStatutType.TRAITEE;
|
||||||
|
} else if (dto.action === CardResponseActionType.REFUSE) {
|
||||||
|
await this.evenementsService.maj(userId, role, card.id_evenement, {
|
||||||
|
statut: StatutEvenementAgendaType.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_evenement) {
|
||||||
|
await this.evenementsService.maj(userId, role, card.id_evenement, {
|
||||||
|
date_debut: debut,
|
||||||
|
date_fin: fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
statut: StatutEvenementAgendaType.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_evenement) {
|
||||||
|
const absStatut =
|
||||||
|
card.statut === CardInstanceStatutType.TRAITEE
|
||||||
|
? null
|
||||||
|
: card.id_evenement;
|
||||||
|
// Supprime l’absence liée si pas encore acceptée définitivement
|
||||||
|
if (
|
||||||
|
card.statut === CardInstanceStatutType.OUVERTE ||
|
||||||
|
card.statut === CardInstanceStatutType.REFUSEE
|
||||||
|
) {
|
||||||
|
await this.evenementsService.supprimer(userId, role, card.id_evenement);
|
||||||
|
}
|
||||||
|
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): TypeEvenementAgendaType {
|
||||||
|
if (typeCode === 'absence_enfant' || typeCode === 'absence_enfant_modif') {
|
||||||
|
return TypeEvenementAgendaType.ABSENCE_ENFANT;
|
||||||
|
}
|
||||||
|
if (typeCode === 'conge_am') return TypeEvenementAgendaType.CONGE_AM;
|
||||||
|
if (typeCode === 'arret_maladie_am') {
|
||||||
|
return TypeEvenementAgendaType.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 evenements_agenda 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,
|
||||||
|
id_placement: card.id_placement,
|
||||||
|
id_evenement: card.id_evenement ?? 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,134 @@
|
|||||||
|
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 evenements_agenda)',
|
||||||
|
})
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
id_evenement?: 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;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
id_evenement?: 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';
|
||||||
@@ -9,18 +9,18 @@ import {
|
|||||||
MinLength,
|
MinLength,
|
||||||
} from 'class-validator';
|
} from 'class-validator';
|
||||||
import {
|
import {
|
||||||
StatutAbsenceGardeType,
|
StatutEvenementAgendaType,
|
||||||
TypeAbsenceGardeType,
|
TypeEvenementAgendaType,
|
||||||
} from 'src/entities/absences_garde.entity';
|
} from 'src/entities/evenements_agenda.entity';
|
||||||
|
|
||||||
export class CreerAbsenceGardeDto {
|
export class CreerEvenementAgendaDto {
|
||||||
@ApiProperty({ description: 'Placement AM↔enfant (couple)' })
|
@ApiProperty({ description: 'Placement AM↔enfant (couple)' })
|
||||||
@IsUUID()
|
@IsUUID()
|
||||||
id_placement: string;
|
id_placement: string;
|
||||||
|
|
||||||
@ApiProperty({ enum: TypeAbsenceGardeType })
|
@ApiProperty({ enum: TypeEvenementAgendaType })
|
||||||
@IsEnum(TypeAbsenceGardeType)
|
@IsEnum(TypeEvenementAgendaType)
|
||||||
type: TypeAbsenceGardeType;
|
type: TypeEvenementAgendaType;
|
||||||
|
|
||||||
@ApiProperty({ example: '2026-10-01' })
|
@ApiProperty({ example: '2026-10-01' })
|
||||||
@IsDateString()
|
@IsDateString()
|
||||||
@@ -37,7 +37,7 @@ export class CreerAbsenceGardeDto {
|
|||||||
motif?: string;
|
motif?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class MajAbsenceGardeDto {
|
export class MajEvenementAgendaDto {
|
||||||
@ApiPropertyOptional({ example: '2026-10-02' })
|
@ApiPropertyOptional({ example: '2026-10-02' })
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsDateString()
|
@IsDateString()
|
||||||
@@ -48,10 +48,10 @@ export class MajAbsenceGardeDto {
|
|||||||
@IsDateString()
|
@IsDateString()
|
||||||
date_fin?: string;
|
date_fin?: string;
|
||||||
|
|
||||||
@ApiPropertyOptional({ enum: StatutAbsenceGardeType })
|
@ApiPropertyOptional({ enum: StatutEvenementAgendaType })
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEnum(StatutAbsenceGardeType)
|
@IsEnum(StatutEvenementAgendaType)
|
||||||
statut?: StatutAbsenceGardeType;
|
statut?: StatutEvenementAgendaType;
|
||||||
|
|
||||||
@ApiPropertyOptional({
|
@ApiPropertyOptional({
|
||||||
description: 'Motivation de refus (parent) ou motif créateur',
|
description: 'Motivation de refus (parent) ou motif créateur',
|
||||||
@@ -63,15 +63,15 @@ export class MajAbsenceGardeDto {
|
|||||||
motif?: string;
|
motif?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class AbsenceGardeDto {
|
export class EvenementAgendaDto {
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
id_placement: string;
|
id_placement: string;
|
||||||
|
|
||||||
@ApiProperty({ enum: TypeAbsenceGardeType })
|
@ApiProperty({ enum: TypeEvenementAgendaType })
|
||||||
type: TypeAbsenceGardeType;
|
type: TypeEvenementAgendaType;
|
||||||
|
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
date_debut: string;
|
date_debut: string;
|
||||||
@@ -79,8 +79,8 @@ export class AbsenceGardeDto {
|
|||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
date_fin: string;
|
date_fin: string;
|
||||||
|
|
||||||
@ApiProperty({ enum: StatutAbsenceGardeType })
|
@ApiProperty({ enum: StatutEvenementAgendaType })
|
||||||
statut: StatutAbsenceGardeType;
|
statut: StatutEvenementAgendaType;
|
||||||
|
|
||||||
@ApiProperty()
|
@ApiProperty()
|
||||||
expire_at: string;
|
expire_at: string;
|
||||||
@@ -113,7 +113,7 @@ export class AbsenceGardeDto {
|
|||||||
modifie_le: string;
|
modifie_le: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ListeAbsencesGardeDto {
|
export class ListeEvenementsAgendaDto {
|
||||||
@ApiProperty({ type: [AbsenceGardeDto] })
|
@ApiProperty({ type: [EvenementAgendaDto] })
|
||||||
items: AbsenceGardeDto[];
|
items: EvenementAgendaDto[];
|
||||||
}
|
}
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
import { AbsencesGardeController } from './absences-garde.controller';
|
import { EvenementsAgendaController } from './evenements-agenda.controller';
|
||||||
import { AbsencesGardeService } from './absences-garde.service';
|
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
import { RoleType } from 'src/entities/users.entity';
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
import { TypeAbsenceGardeType } from 'src/entities/absences_garde.entity';
|
import { TypeEvenementAgendaType } from 'src/entities/evenements_agenda.entity';
|
||||||
|
|
||||||
describe('AbsencesGardeController (#172)', () => {
|
describe('EvenementsAgendaController (#172)', () => {
|
||||||
let controller: AbsencesGardeController;
|
let controller: EvenementsAgendaController;
|
||||||
const serviceMock = {
|
const serviceMock = {
|
||||||
lister: jest.fn(),
|
lister: jest.fn(),
|
||||||
creer: jest.fn(),
|
creer: jest.fn(),
|
||||||
@@ -17,8 +17,8 @@ describe('AbsencesGardeController (#172)', () => {
|
|||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
controllers: [AbsencesGardeController],
|
controllers: [EvenementsAgendaController],
|
||||||
providers: [{ provide: AbsencesGardeService, useValue: serviceMock }],
|
providers: [{ provide: EvenementsAgendaService, useValue: serviceMock }],
|
||||||
})
|
})
|
||||||
.overrideGuard(AuthGuard)
|
.overrideGuard(AuthGuard)
|
||||||
.useValue({ canActivate: () => true })
|
.useValue({ canActivate: () => true })
|
||||||
@@ -26,7 +26,7 @@ describe('AbsencesGardeController (#172)', () => {
|
|||||||
.useValue({ canActivate: () => true })
|
.useValue({ canActivate: () => true })
|
||||||
.compile();
|
.compile();
|
||||||
|
|
||||||
controller = module.get(AbsencesGardeController);
|
controller = module.get(EvenementsAgendaController);
|
||||||
jest.clearAllMocks();
|
jest.clearAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ describe('AbsencesGardeController (#172)', () => {
|
|||||||
serviceMock.creer.mockResolvedValue({ id: 'a1' });
|
serviceMock.creer.mockResolvedValue({ id: 'a1' });
|
||||||
const dto = {
|
const dto = {
|
||||||
id_placement: 'pl-1',
|
id_placement: 'pl-1',
|
||||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||||
date_debut: '2026-10-01',
|
date_debut: '2026-10-01',
|
||||||
date_fin: '2026-10-02',
|
date_fin: '2026-10-02',
|
||||||
};
|
};
|
||||||
@@ -25,49 +25,49 @@ import { RolesGuard } from 'src/common/guards/roles.guard';
|
|||||||
import { Roles } from 'src/common/decorators/roles.decorator';
|
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||||
import { User } from 'src/common/decorators/user.decorator';
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
import {
|
import {
|
||||||
StatutAbsenceGardeType,
|
StatutEvenementAgendaType,
|
||||||
TypeAbsenceGardeType,
|
TypeEvenementAgendaType,
|
||||||
} from 'src/entities/absences_garde.entity';
|
} from 'src/entities/evenements_agenda.entity';
|
||||||
import { RoleType } from 'src/entities/users.entity';
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
import { AbsencesGardeService } from './absences-garde.service';
|
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||||
import {
|
import {
|
||||||
AbsenceGardeDto,
|
EvenementAgendaDto,
|
||||||
CreerAbsenceGardeDto,
|
CreerEvenementAgendaDto,
|
||||||
ListeAbsencesGardeDto,
|
ListeEvenementsAgendaDto,
|
||||||
MajAbsenceGardeDto,
|
MajEvenementAgendaDto,
|
||||||
} from './dto/absences-garde.dto';
|
} from './dto/evenements-agenda.dto';
|
||||||
|
|
||||||
@ApiTags('Absences garde')
|
@ApiTags('Événements agenda')
|
||||||
@ApiBearerAuth('access-token')
|
@ApiBearerAuth('access-token')
|
||||||
@Controller('absences-garde')
|
@Controller('evenements-agenda')
|
||||||
@UseGuards(AuthGuard, RolesGuard)
|
@UseGuards(AuthGuard, RolesGuard)
|
||||||
export class AbsencesGardeController {
|
export class EvenementsAgendaController {
|
||||||
constructor(private readonly absencesGardeService: AbsencesGardeService) {}
|
constructor(private readonly evenementsAgendaService: EvenementsAgendaService) {}
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
@ApiOperation({
|
@ApiOperation({
|
||||||
summary: 'Lister les absences / congés / arrêts — ticket #172',
|
summary: 'Lister les absences / congés / arrêts — ticket #205 / ex-#172',
|
||||||
description:
|
description:
|
||||||
'Sans placementId : tous les placements du user (parent = famille multi-AM ; AM = tous accueils). ' +
|
'Sans placementId : tous les placements du user (parent = famille multi-AM ; AM = tous accueils). ' +
|
||||||
'Avec placementId : un couple enfant–AM.',
|
'Avec placementId : un couple enfant–AM.',
|
||||||
})
|
})
|
||||||
@ApiQuery({ name: 'placementId', required: false })
|
@ApiQuery({ name: 'placementId', required: false })
|
||||||
@ApiQuery({ name: 'type', required: false, enum: TypeAbsenceGardeType })
|
@ApiQuery({ name: 'type', required: false, enum: TypeEvenementAgendaType })
|
||||||
@ApiQuery({ name: 'statut', required: false, enum: StatutAbsenceGardeType })
|
@ApiQuery({ name: 'statut', required: false, enum: StatutEvenementAgendaType })
|
||||||
@ApiQuery({ name: 'from', required: false, description: 'YYYY-MM-DD' })
|
@ApiQuery({ name: 'from', required: false, description: 'YYYY-MM-DD' })
|
||||||
@ApiQuery({ name: 'to', required: false, description: 'YYYY-MM-DD' })
|
@ApiQuery({ name: 'to', required: false, description: 'YYYY-MM-DD' })
|
||||||
@ApiResponse({ status: 200, type: ListeAbsencesGardeDto })
|
@ApiResponse({ status: 200, type: ListeEvenementsAgendaDto })
|
||||||
lister(
|
lister(
|
||||||
@User('id') userId: string,
|
@User('id') userId: string,
|
||||||
@User('role') role: RoleType,
|
@User('role') role: RoleType,
|
||||||
@Query('placementId') placementId?: string,
|
@Query('placementId') placementId?: string,
|
||||||
@Query('type') type?: TypeAbsenceGardeType,
|
@Query('type') type?: TypeEvenementAgendaType,
|
||||||
@Query('statut') statut?: StatutAbsenceGardeType,
|
@Query('statut') statut?: StatutEvenementAgendaType,
|
||||||
@Query('from') from?: string,
|
@Query('from') from?: string,
|
||||||
@Query('to') to?: string,
|
@Query('to') to?: string,
|
||||||
): Promise<ListeAbsencesGardeDto> {
|
): Promise<ListeEvenementsAgendaDto> {
|
||||||
return this.absencesGardeService.lister(userId, role, {
|
return this.evenementsAgendaService.lister(userId, role, {
|
||||||
placementId,
|
placementId,
|
||||||
type,
|
type,
|
||||||
statut,
|
statut,
|
||||||
@@ -79,15 +79,15 @@ export class AbsencesGardeController {
|
|||||||
@Post()
|
@Post()
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
@ApiOperation({ summary: 'Créer une période d’absence / congé / arrêt — #172' })
|
@ApiOperation({ summary: 'Créer une période d’absence / congé / arrêt — #172' })
|
||||||
@ApiBody({ type: CreerAbsenceGardeDto })
|
@ApiBody({ type: CreerEvenementAgendaDto })
|
||||||
@ApiResponse({ status: 201, type: AbsenceGardeDto })
|
@ApiResponse({ status: 201, type: EvenementAgendaDto })
|
||||||
@HttpCode(HttpStatus.CREATED)
|
@HttpCode(HttpStatus.CREATED)
|
||||||
creer(
|
creer(
|
||||||
@User('id') userId: string,
|
@User('id') userId: string,
|
||||||
@User('role') role: RoleType,
|
@User('role') role: RoleType,
|
||||||
@Body() dto: CreerAbsenceGardeDto,
|
@Body() dto: CreerEvenementAgendaDto,
|
||||||
): Promise<AbsenceGardeDto> {
|
): Promise<EvenementAgendaDto> {
|
||||||
return this.absencesGardeService.creer(userId, role, dto);
|
return this.evenementsAgendaService.creer(userId, role, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id')
|
@Patch(':id')
|
||||||
@@ -98,15 +98,15 @@ export class AbsencesGardeController {
|
|||||||
'Parent : accept/refuse congé (motivation si refus), ack arrêt. ' +
|
'Parent : accept/refuse congé (motivation si refus), ack arrêt. ' +
|
||||||
'AM : modifier dates (en attente / refuse / accepté), republication après refus.',
|
'AM : modifier dates (en attente / refuse / accepté), republication après refus.',
|
||||||
})
|
})
|
||||||
@ApiBody({ type: MajAbsenceGardeDto })
|
@ApiBody({ type: MajEvenementAgendaDto })
|
||||||
@ApiResponse({ status: 200, type: AbsenceGardeDto })
|
@ApiResponse({ status: 200, type: EvenementAgendaDto })
|
||||||
maj(
|
maj(
|
||||||
@User('id') userId: string,
|
@User('id') userId: string,
|
||||||
@User('role') role: RoleType,
|
@User('role') role: RoleType,
|
||||||
@Param('id', ParseUUIDPipe) id: string,
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
@Body() dto: MajAbsenceGardeDto,
|
@Body() dto: MajEvenementAgendaDto,
|
||||||
): Promise<AbsenceGardeDto> {
|
): Promise<EvenementAgendaDto> {
|
||||||
return this.absencesGardeService.maj(userId, role, id, dto);
|
return this.evenementsAgendaService.maj(userId, role, id, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete(':id')
|
@Delete(':id')
|
||||||
@@ -119,6 +119,6 @@ export class AbsencesGardeController {
|
|||||||
@User('role') role: RoleType,
|
@User('role') role: RoleType,
|
||||||
@Param('id', ParseUUIDPipe) id: string,
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
await this.absencesGardeService.supprimer(userId, role, id);
|
await this.evenementsAgendaService.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 { EvenementsAgenda } from 'src/entities/evenements_agenda.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { EvenementsAgendaController } from './evenements-agenda.controller';
|
||||||
|
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
TypeOrmModule.forFeature([EvenementsAgenda, AmChildren, ParentsChildren]),
|
||||||
|
JwtModule.registerAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: (config: ConfigService) => ({
|
||||||
|
secret: config.get('jwt.accessSecret'),
|
||||||
|
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
|
||||||
|
}),
|
||||||
|
inject: [ConfigService],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
controllers: [EvenementsAgendaController],
|
||||||
|
providers: [EvenementsAgendaService],
|
||||||
|
exports: [EvenementsAgendaService],
|
||||||
|
})
|
||||||
|
export class EvenementsAgendaModule {}
|
||||||
@@ -1,18 +1,18 @@
|
|||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
import { ForbiddenException, BadRequestException } from '@nestjs/common';
|
import { ForbiddenException, BadRequestException } from '@nestjs/common';
|
||||||
import { AbsencesGardeService } from './absences-garde.service';
|
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||||
import {
|
import {
|
||||||
AbsencesGarde,
|
EvenementsAgenda,
|
||||||
StatutAbsenceGardeType,
|
StatutEvenementAgendaType,
|
||||||
TypeAbsenceGardeType,
|
TypeEvenementAgendaType,
|
||||||
} from 'src/entities/absences_garde.entity';
|
} from 'src/entities/evenements_agenda.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { RoleType } from 'src/entities/users.entity';
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
|
||||||
describe('AbsencesGardeService (#172)', () => {
|
describe('EvenementsAgendaService (#172)', () => {
|
||||||
let service: AbsencesGardeService;
|
let service: EvenementsAgendaService;
|
||||||
const absencesRepo = {
|
const absencesRepo = {
|
||||||
create: jest.fn((x) => x),
|
create: jest.fn((x) => x),
|
||||||
save: jest.fn(async (x) => ({
|
save: jest.fn(async (x) => ({
|
||||||
@@ -37,8 +37,8 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
providers: [
|
providers: [
|
||||||
AbsencesGardeService,
|
EvenementsAgendaService,
|
||||||
{ provide: getRepositoryToken(AbsencesGarde), useValue: absencesRepo },
|
{ provide: getRepositoryToken(EvenementsAgenda), useValue: absencesRepo },
|
||||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||||
{
|
{
|
||||||
provide: getRepositoryToken(ParentsChildren),
|
provide: getRepositoryToken(ParentsChildren),
|
||||||
@@ -46,7 +46,7 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
}).compile();
|
}).compile();
|
||||||
service = module.get(AbsencesGardeService);
|
service = module.get(EvenementsAgendaService);
|
||||||
jest.clearAllMocks();
|
jest.clearAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -68,10 +68,10 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
absencesRepo.findOne.mockResolvedValue({
|
absencesRepo.findOne.mockResolvedValue({
|
||||||
id: 'abs-1',
|
id: 'abs-1',
|
||||||
id_placement: 'pl-1',
|
id_placement: 'pl-1',
|
||||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||||
date_debut: '2026-10-01',
|
date_debut: '2026-10-01',
|
||||||
date_fin: '2026-10-02',
|
date_fin: '2026-10-02',
|
||||||
statut: StatutAbsenceGardeType.ACCEPTE,
|
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||||
expire_at: new Date('9999-12-31'),
|
expire_at: new Date('9999-12-31'),
|
||||||
cree_le: new Date(),
|
cree_le: new Date(),
|
||||||
modifie_le: new Date(),
|
modifie_le: new Date(),
|
||||||
@@ -85,15 +85,15 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
|
|
||||||
const res = await service.creer('p-1', RoleType.PARENT, {
|
const res = await service.creer('p-1', RoleType.PARENT, {
|
||||||
id_placement: 'pl-1',
|
id_placement: 'pl-1',
|
||||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||||
date_debut: '2026-10-01',
|
date_debut: '2026-10-01',
|
||||||
date_fin: '2026-10-02',
|
date_fin: '2026-10-02',
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(absencesRepo.save).toHaveBeenCalled();
|
expect(absencesRepo.save).toHaveBeenCalled();
|
||||||
const savedArg = absencesRepo.save.mock.calls[0][0];
|
const savedArg = absencesRepo.save.mock.calls[0][0];
|
||||||
expect(savedArg.statut).toBe(StatutAbsenceGardeType.ACCEPTE);
|
expect(savedArg.statut).toBe(StatutEvenementAgendaType.ACCEPTE);
|
||||||
expect(res.type).toBe(TypeAbsenceGardeType.ABSENCE_ENFANT);
|
expect(res.type).toBe(TypeEvenementAgendaType.ABSENCE_ENFANT);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('parent ne peut pas créer un congé AM', async () => {
|
it('parent ne peut pas créer un congé AM', async () => {
|
||||||
@@ -110,7 +110,7 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
await expect(
|
await expect(
|
||||||
service.creer('p-1', RoleType.PARENT, {
|
service.creer('p-1', RoleType.PARENT, {
|
||||||
id_placement: 'pl-1',
|
id_placement: 'pl-1',
|
||||||
type: TypeAbsenceGardeType.CONGE_AM,
|
type: TypeEvenementAgendaType.CONGE_AM,
|
||||||
date_debut: '2026-10-01',
|
date_debut: '2026-10-01',
|
||||||
date_fin: '2026-10-05',
|
date_fin: '2026-10-05',
|
||||||
}),
|
}),
|
||||||
@@ -121,10 +121,10 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
absencesRepo.findOne.mockResolvedValue({
|
absencesRepo.findOne.mockResolvedValue({
|
||||||
id: 'abs-1',
|
id: 'abs-1',
|
||||||
id_placement: 'pl-1',
|
id_placement: 'pl-1',
|
||||||
type: TypeAbsenceGardeType.CONGE_AM,
|
type: TypeEvenementAgendaType.CONGE_AM,
|
||||||
date_debut: '2026-10-01',
|
date_debut: '2026-10-01',
|
||||||
date_fin: '2026-10-05',
|
date_fin: '2026-10-05',
|
||||||
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
statut: StatutEvenementAgendaType.EN_ATTENTE,
|
||||||
expire_at: new Date(),
|
expire_at: new Date(),
|
||||||
});
|
});
|
||||||
amChildrenRepo.findOne.mockResolvedValue({
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
@@ -140,7 +140,7 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
|
|
||||||
await expect(
|
await expect(
|
||||||
service.maj('p-1', RoleType.PARENT, 'abs-1', {
|
service.maj('p-1', RoleType.PARENT, 'abs-1', {
|
||||||
statut: StatutAbsenceGardeType.REFUSE,
|
statut: StatutEvenementAgendaType.REFUSE,
|
||||||
}),
|
}),
|
||||||
).rejects.toBeInstanceOf(BadRequestException);
|
).rejects.toBeInstanceOf(BadRequestException);
|
||||||
});
|
});
|
||||||
@@ -159,7 +159,7 @@ describe('AbsencesGardeService (#172)', () => {
|
|||||||
await expect(
|
await expect(
|
||||||
service.creer('p-1', RoleType.PARENT, {
|
service.creer('p-1', RoleType.PARENT, {
|
||||||
id_placement: 'pl-1',
|
id_placement: 'pl-1',
|
||||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||||
date_debut: '2026-10-10',
|
date_debut: '2026-10-10',
|
||||||
date_fin: '2026-10-01',
|
date_fin: '2026-10-01',
|
||||||
}),
|
}),
|
||||||
@@ -7,19 +7,19 @@ import {
|
|||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { In, IsNull, Repository } from 'typeorm';
|
import { In, IsNull, Repository } from 'typeorm';
|
||||||
import {
|
import {
|
||||||
AbsencesGarde,
|
EvenementsAgenda,
|
||||||
StatutAbsenceGardeType,
|
StatutEvenementAgendaType,
|
||||||
TypeAbsenceGardeType,
|
TypeEvenementAgendaType,
|
||||||
} from 'src/entities/absences_garde.entity';
|
} from 'src/entities/evenements_agenda.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { RoleType } from 'src/entities/users.entity';
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
import {
|
import {
|
||||||
AbsenceGardeDto,
|
EvenementAgendaDto,
|
||||||
CreerAbsenceGardeDto,
|
CreerEvenementAgendaDto,
|
||||||
ListeAbsencesGardeDto,
|
ListeEvenementsAgendaDto,
|
||||||
MajAbsenceGardeDto,
|
MajEvenementAgendaDto,
|
||||||
} from './dto/absences-garde.dto';
|
} from './dto/evenements-agenda.dto';
|
||||||
|
|
||||||
const TTL_EN_ATTENTE_MS = 15 * 24 * 60 * 60 * 1000;
|
const TTL_EN_ATTENTE_MS = 15 * 24 * 60 * 60 * 1000;
|
||||||
const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
||||||
@@ -27,10 +27,10 @@ const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
|||||||
const EXPIRE_ACCEPTE = new Date('9999-12-31T23:59:59.999Z');
|
const EXPIRE_ACCEPTE = new Date('9999-12-31T23:59:59.999Z');
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AbsencesGardeService {
|
export class EvenementsAgendaService {
|
||||||
constructor(
|
constructor(
|
||||||
@InjectRepository(AbsencesGarde)
|
@InjectRepository(EvenementsAgenda)
|
||||||
private readonly absencesRepo: Repository<AbsencesGarde>,
|
private readonly absencesRepo: Repository<EvenementsAgenda>,
|
||||||
@InjectRepository(AmChildren)
|
@InjectRepository(AmChildren)
|
||||||
private readonly amChildrenRepo: Repository<AmChildren>,
|
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||||
@InjectRepository(ParentsChildren)
|
@InjectRepository(ParentsChildren)
|
||||||
@@ -42,12 +42,12 @@ export class AbsencesGardeService {
|
|||||||
role: RoleType,
|
role: RoleType,
|
||||||
opts: {
|
opts: {
|
||||||
placementId?: string;
|
placementId?: string;
|
||||||
type?: TypeAbsenceGardeType;
|
type?: TypeEvenementAgendaType;
|
||||||
statut?: StatutAbsenceGardeType;
|
statut?: StatutEvenementAgendaType;
|
||||||
from?: string;
|
from?: string;
|
||||||
to?: string;
|
to?: string;
|
||||||
},
|
},
|
||||||
): Promise<ListeAbsencesGardeDto> {
|
): Promise<ListeEvenementsAgendaDto> {
|
||||||
const placementIds = await this.resolvePlacementIds(
|
const placementIds = await this.resolvePlacementIds(
|
||||||
userId,
|
userId,
|
||||||
role,
|
role,
|
||||||
@@ -86,8 +86,8 @@ export class AbsencesGardeService {
|
|||||||
async creer(
|
async creer(
|
||||||
userId: string,
|
userId: string,
|
||||||
role: RoleType,
|
role: RoleType,
|
||||||
dto: CreerAbsenceGardeDto,
|
dto: CreerEvenementAgendaDto,
|
||||||
): Promise<AbsenceGardeDto> {
|
): Promise<EvenementAgendaDto> {
|
||||||
this.assertDates(dto.date_debut, dto.date_fin);
|
this.assertDates(dto.date_debut, dto.date_fin);
|
||||||
await this.assertCanAccessPlacement(userId, role, dto.id_placement);
|
await this.assertCanAccessPlacement(userId, role, dto.id_placement);
|
||||||
this.assertCanCreateType(role, dto.type);
|
this.assertCanCreateType(role, dto.type);
|
||||||
@@ -111,8 +111,8 @@ export class AbsencesGardeService {
|
|||||||
userId: string,
|
userId: string,
|
||||||
role: RoleType,
|
role: RoleType,
|
||||||
id: string,
|
id: string,
|
||||||
dto: MajAbsenceGardeDto,
|
dto: MajEvenementAgendaDto,
|
||||||
): Promise<AbsenceGardeDto> {
|
): Promise<EvenementAgendaDto> {
|
||||||
const row = await this.absencesRepo.findOne({ where: { id } });
|
const row = await this.absencesRepo.findOne({ where: { id } });
|
||||||
if (!row) {
|
if (!row) {
|
||||||
throw new NotFoundException('Absence introuvable');
|
throw new NotFoundException('Absence introuvable');
|
||||||
@@ -128,15 +128,15 @@ export class AbsencesGardeService {
|
|||||||
this.assertCanEditDates(role, row);
|
this.assertCanEditDates(role, row);
|
||||||
row.date_debut = debut;
|
row.date_debut = debut;
|
||||||
row.date_fin = fin;
|
row.date_fin = fin;
|
||||||
if (row.statut === StatutAbsenceGardeType.EN_ATTENTE) {
|
if (row.statut === StatutEvenementAgendaType.EN_ATTENTE) {
|
||||||
row.expire_at = this.expireAtFor(StatutAbsenceGardeType.EN_ATTENTE);
|
row.expire_at = this.expireAtFor(StatutEvenementAgendaType.EN_ATTENTE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dto.statut !== undefined && dto.statut !== row.statut) {
|
if (dto.statut !== undefined && dto.statut !== row.statut) {
|
||||||
this.assertCanChangeStatut(role, row, dto.statut, dto.motif);
|
this.assertCanChangeStatut(role, row, dto.statut, dto.motif);
|
||||||
if (
|
if (
|
||||||
dto.statut === StatutAbsenceGardeType.REFUSE &&
|
dto.statut === StatutEvenementAgendaType.REFUSE &&
|
||||||
(!dto.motif || !dto.motif.trim())
|
(!dto.motif || !dto.motif.trim())
|
||||||
) {
|
) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
@@ -169,7 +169,7 @@ export class AbsencesGardeService {
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
role === RoleType.PARENT &&
|
role === RoleType.PARENT &&
|
||||||
row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT
|
row.type !== TypeEvenementAgendaType.ABSENCE_ENFANT
|
||||||
) {
|
) {
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
'Un parent ne peut supprimer que les absences enfant',
|
'Un parent ne peut supprimer que les absences enfant',
|
||||||
@@ -183,7 +183,7 @@ export class AbsencesGardeService {
|
|||||||
id: string,
|
id: string,
|
||||||
userId: string,
|
userId: string,
|
||||||
role: RoleType,
|
role: RoleType,
|
||||||
): Promise<AbsenceGardeDto> {
|
): Promise<EvenementAgendaDto> {
|
||||||
const row = await this.absencesRepo.findOne({
|
const row = await this.absencesRepo.findOne({
|
||||||
where: { id },
|
where: { id },
|
||||||
relations: ['placement', 'placement.child', 'placement.am', 'placement.am.user'],
|
relations: ['placement', 'placement.child', 'placement.am', 'placement.am.user'],
|
||||||
@@ -195,19 +195,19 @@ export class AbsencesGardeService {
|
|||||||
return this.toDto(row);
|
return this.toDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
private statutInitial(type: TypeAbsenceGardeType): StatutAbsenceGardeType {
|
private statutInitial(type: TypeEvenementAgendaType): StatutEvenementAgendaType {
|
||||||
if (type === TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
if (type === TypeEvenementAgendaType.ABSENCE_ENFANT) {
|
||||||
return StatutAbsenceGardeType.ACCEPTE;
|
return StatutEvenementAgendaType.ACCEPTE;
|
||||||
}
|
}
|
||||||
return StatutAbsenceGardeType.EN_ATTENTE;
|
return StatutEvenementAgendaType.EN_ATTENTE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private expireAtFor(statut: StatutAbsenceGardeType): Date {
|
private expireAtFor(statut: StatutEvenementAgendaType): Date {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
if (statut === StatutAbsenceGardeType.ACCEPTE) {
|
if (statut === StatutEvenementAgendaType.ACCEPTE) {
|
||||||
return EXPIRE_ACCEPTE;
|
return EXPIRE_ACCEPTE;
|
||||||
}
|
}
|
||||||
if (statut === StatutAbsenceGardeType.REFUSE) {
|
if (statut === StatutEvenementAgendaType.REFUSE) {
|
||||||
return new Date(now + TTL_REFUSE_MS);
|
return new Date(now + TTL_REFUSE_MS);
|
||||||
}
|
}
|
||||||
return new Date(now + TTL_EN_ATTENTE_MS);
|
return new Date(now + TTL_EN_ATTENTE_MS);
|
||||||
@@ -221,9 +221,9 @@ export class AbsencesGardeService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private assertCanCreateType(role: RoleType, type: TypeAbsenceGardeType): void {
|
private assertCanCreateType(role: RoleType, type: TypeEvenementAgendaType): void {
|
||||||
if (role === RoleType.PARENT) {
|
if (role === RoleType.PARENT) {
|
||||||
if (type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
if (type !== TypeEvenementAgendaType.ABSENCE_ENFANT) {
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
'Un parent ne peut créer que des absences enfant',
|
'Un parent ne peut créer que des absences enfant',
|
||||||
);
|
);
|
||||||
@@ -232,8 +232,8 @@ export class AbsencesGardeService {
|
|||||||
}
|
}
|
||||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
if (
|
if (
|
||||||
type !== TypeAbsenceGardeType.CONGE_AM &&
|
type !== TypeEvenementAgendaType.CONGE_AM &&
|
||||||
type !== TypeAbsenceGardeType.ARRET_MALADIE_AM
|
type !== TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||||
) {
|
) {
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
'Une AM ne peut créer que congé ou arrêt maladie',
|
'Une AM ne peut créer que congé ou arrêt maladie',
|
||||||
@@ -246,10 +246,10 @@ export class AbsencesGardeService {
|
|||||||
|
|
||||||
private assertCanEditDates(
|
private assertCanEditDates(
|
||||||
role: RoleType,
|
role: RoleType,
|
||||||
row: AbsencesGarde,
|
row: EvenementsAgenda,
|
||||||
): void {
|
): void {
|
||||||
if (role === RoleType.PARENT) {
|
if (role === RoleType.PARENT) {
|
||||||
if (row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
if (row.type !== TypeEvenementAgendaType.ABSENCE_ENFANT) {
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
'Un parent ne peut modifier que les absences enfant',
|
'Un parent ne peut modifier que les absences enfant',
|
||||||
);
|
);
|
||||||
@@ -258,13 +258,13 @@ export class AbsencesGardeService {
|
|||||||
}
|
}
|
||||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
if (
|
if (
|
||||||
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
row.type === TypeEvenementAgendaType.CONGE_AM ||
|
||||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||||
) {
|
) {
|
||||||
if (
|
if (
|
||||||
row.statut !== StatutAbsenceGardeType.EN_ATTENTE &&
|
row.statut !== StatutEvenementAgendaType.EN_ATTENTE &&
|
||||||
row.statut !== StatutAbsenceGardeType.REFUSE &&
|
row.statut !== StatutEvenementAgendaType.REFUSE &&
|
||||||
row.statut !== StatutAbsenceGardeType.ACCEPTE
|
row.statut !== StatutEvenementAgendaType.ACCEPTE
|
||||||
) {
|
) {
|
||||||
throw new ForbiddenException('Statut incompatible avec une modification');
|
throw new ForbiddenException('Statut incompatible avec une modification');
|
||||||
}
|
}
|
||||||
@@ -278,31 +278,31 @@ export class AbsencesGardeService {
|
|||||||
|
|
||||||
private assertCanChangeStatut(
|
private assertCanChangeStatut(
|
||||||
role: RoleType,
|
role: RoleType,
|
||||||
row: AbsencesGarde,
|
row: EvenementsAgenda,
|
||||||
next: StatutAbsenceGardeType,
|
next: StatutEvenementAgendaType,
|
||||||
_motif?: string,
|
_motif?: string,
|
||||||
): void {
|
): void {
|
||||||
if (role === RoleType.PARENT) {
|
if (role === RoleType.PARENT) {
|
||||||
// Accept / refuse congé ; ack arrêt (accepte)
|
// Accept / refuse congé ; ack arrêt (accepte)
|
||||||
if (
|
if (
|
||||||
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
row.type === TypeEvenementAgendaType.CONGE_AM ||
|
||||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||||
) {
|
) {
|
||||||
if (
|
if (
|
||||||
next !== StatutAbsenceGardeType.ACCEPTE &&
|
next !== StatutEvenementAgendaType.ACCEPTE &&
|
||||||
next !== StatutAbsenceGardeType.REFUSE
|
next !== StatutEvenementAgendaType.REFUSE
|
||||||
) {
|
) {
|
||||||
throw new BadRequestException('Transition de statut invalide');
|
throw new BadRequestException('Transition de statut invalide');
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM &&
|
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM &&
|
||||||
next === StatutAbsenceGardeType.REFUSE
|
next === StatutEvenementAgendaType.REFUSE
|
||||||
) {
|
) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
'Un arrêt maladie ne se refuse pas (accusé seulement)',
|
'Un arrêt maladie ne se refuse pas (accusé seulement)',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (row.statut !== StatutAbsenceGardeType.EN_ATTENTE) {
|
if (row.statut !== StatutEvenementAgendaType.EN_ATTENTE) {
|
||||||
throw new BadRequestException('Cette demande n’est plus en attente');
|
throw new BadRequestException('Cette demande n’est plus en attente');
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -312,15 +312,16 @@ export class AbsencesGardeService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
// Remise en attente après refus (republication)
|
// Remise en attente après refus OU modification d’un congé déjà accepté (S2b)
|
||||||
if (
|
if (
|
||||||
row.statut === StatutAbsenceGardeType.REFUSE &&
|
next === StatutEvenementAgendaType.EN_ATTENTE &&
|
||||||
next === StatutAbsenceGardeType.EN_ATTENTE
|
(row.statut === StatutEvenementAgendaType.REFUSE ||
|
||||||
|
row.statut === StatutEvenementAgendaType.ACCEPTE)
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
'L’AM ne valide pas elle-même (sauf republication après refus)',
|
'L’AM ne valide pas elle-même (sauf republication / modification)',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
throw new ForbiddenException('Changement de statut non autorisé');
|
throw new ForbiddenException('Changement de statut non autorisé');
|
||||||
@@ -395,7 +396,7 @@ export class AbsencesGardeService {
|
|||||||
throw new ForbiddenException('Rôle non autorisé');
|
throw new ForbiddenException('Rôle non autorisé');
|
||||||
}
|
}
|
||||||
|
|
||||||
private toDto(row: AbsencesGarde): AbsenceGardeDto {
|
private toDto(row: EvenementsAgenda): EvenementAgendaDto {
|
||||||
const child = row.placement?.child;
|
const child = row.placement?.child;
|
||||||
const amUser = row.placement?.am?.user;
|
const amUser = row.placement?.am?.user;
|
||||||
return {
|
return {
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
export { EvenementsAgendaModule } from './evenements-agenda.module';
|
||||||
|
export { EvenementsAgendaService } from './evenements-agenda.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;
|
||||||
|
}
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
Stack trace:
|
|
||||||
Frame Function Args
|
|
||||||
0007FFFFAC10 00021005FEBA (000210285F48, 00021026AB6E, 000000000000, 0007FFFF9B10) msys-2.0.dll+0x1FEBA
|
|
||||||
0007FFFFAC10 0002100467F9 (000000000000, 000000000000, 000000000000, 0007FFFFAEE8) msys-2.0.dll+0x67F9
|
|
||||||
0007FFFFAC10 000210046832 (000210285FF9, 0007FFFFAAC8, 000000000000, 000000000000) msys-2.0.dll+0x6832
|
|
||||||
0007FFFFAC10 000210068F86 (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x28F86
|
|
||||||
0007FFFFAC10 0002100690B4 (0007FFFFAC20, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x290B4
|
|
||||||
0007FFFFAEF0 00021006A49D (0007FFFFAC20, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A49D
|
|
||||||
End of stack trace
|
|
||||||
Loaded modules:
|
|
||||||
000100400000 bash.exe
|
|
||||||
7FFE2CD00000 ntdll.dll
|
|
||||||
7FFE2C1F0000 KERNEL32.DLL
|
|
||||||
7FFE29C90000 KERNELBASE.dll
|
|
||||||
7FFE2B8C0000 USER32.dll
|
|
||||||
7FFE2A090000 win32u.dll
|
|
||||||
7FFE2C410000 GDI32.dll
|
|
||||||
7FFE29730000 gdi32full.dll
|
|
||||||
7FFE29860000 msvcp_win.dll
|
|
||||||
7FFE2A930000 ucrtbase.dll
|
|
||||||
000210040000 msys-2.0.dll
|
|
||||||
7FFE2C350000 advapi32.dll
|
|
||||||
7FFE2B810000 msvcrt.dll
|
|
||||||
7FFE2CC10000 sechost.dll
|
|
||||||
7FFE2AB30000 RPCRT4.dll
|
|
||||||
7FFE28D10000 CRYPTBASE.DLL
|
|
||||||
7FFE29B50000 bcryptPrimitives.dll
|
|
||||||
7FFE2CAD0000 IMM32.DLL
|
|
||||||
@@ -35,13 +35,13 @@ 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_absence_garde_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_agenda_type') THEN
|
||||||
CREATE TYPE type_absence_garde_type AS ENUM (
|
CREATE TYPE type_evenement_agenda_type AS ENUM (
|
||||||
'absence_enfant', 'conge_am', 'arret_maladie_am'
|
'absence_enfant', 'conge_am', 'arret_maladie_am'
|
||||||
);
|
);
|
||||||
END IF;
|
END IF;
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_agenda_type') THEN
|
||||||
CREATE TYPE statut_absence_garde_type AS ENUM (
|
CREATE TYPE statut_evenement_agenda_type AS ENUM (
|
||||||
'en_attente', 'accepte', 'refuse'
|
'en_attente', 'accepte', 'refuse'
|
||||||
);
|
);
|
||||||
END IF;
|
END IF;
|
||||||
@@ -143,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
|
||||||
@@ -221,6 +224,16 @@ CREATE INDEX idx_parents_placement_garde_courant
|
|||||||
ON parents(id_placement_garde_courant)
|
ON parents(id_placement_garde_courant)
|
||||||
WHERE id_placement_garde_courant IS NOT NULL;
|
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)
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
@@ -309,32 +322,32 @@ CREATE TABLE avenants_contrats (
|
|||||||
);
|
);
|
||||||
|
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
-- Table : absences_garde (vérité métier absences/congés/arrêt)
|
-- Table : evenements_agenda (vérité métier agenda (absences/congés/arrêt + futurs types))
|
||||||
-- 1 ligne = 1 période ; rattachement = placement AM↔enfant (#193)
|
-- 1 ligne = 1 période ; rattachement = placement AM↔enfant (#193)
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
CREATE TABLE absences_garde (
|
CREATE TABLE evenements_agenda (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
id_placement UUID NOT NULL
|
id_placement UUID NOT NULL
|
||||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||||
type type_absence_garde_type NOT NULL,
|
type type_evenement_agenda_type NOT NULL,
|
||||||
date_debut DATE NOT NULL,
|
date_debut DATE NOT NULL,
|
||||||
date_fin DATE NOT NULL,
|
date_fin DATE NOT NULL,
|
||||||
statut statut_absence_garde_type NOT NULL DEFAULT 'en_attente',
|
statut statut_evenement_agenda_type NOT NULL DEFAULT 'en_attente',
|
||||||
expire_at TIMESTAMPTZ NOT NULL,
|
expire_at TIMESTAMPTZ NOT NULL,
|
||||||
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||||
id_card_instance UUID,
|
id_card_instance UUID,
|
||||||
motif TEXT,
|
motif TEXT,
|
||||||
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
CONSTRAINT chk_absences_garde_dates CHECK (date_fin >= date_debut)
|
CONSTRAINT chk_evenements_agenda_dates CHECK (date_fin >= date_debut)
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE INDEX idx_absences_garde_placement_dates
|
CREATE INDEX idx_evenements_agenda_placement_dates
|
||||||
ON absences_garde (id_placement, date_debut, date_fin);
|
ON evenements_agenda (id_placement, date_debut, date_fin);
|
||||||
CREATE INDEX idx_absences_garde_placement_type_statut
|
CREATE INDEX idx_evenements_agenda_placement_type_statut
|
||||||
ON absences_garde (id_placement, type, statut);
|
ON evenements_agenda (id_placement, type, statut);
|
||||||
CREATE INDEX idx_absences_garde_expire_at
|
CREATE INDEX idx_evenements_agenda_expire_at
|
||||||
ON absences_garde (expire_at)
|
ON evenements_agenda (expire_at)
|
||||||
WHERE statut IN ('en_attente', 'refuse');
|
WHERE statut IN ('en_attente', 'refuse');
|
||||||
|
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ Ce document recense **toutes les valeurs énumérées** utilisées dans la base
|
|||||||
|
|
||||||
## 7) Type d’absence de garde — `type`
|
## 7) Type d’absence de garde — `type`
|
||||||
|
|
||||||
**Tables/colonnes** : `absences_garde.type`
|
**Tables/colonnes** : `evenements_agenda.type`
|
||||||
**Valeurs autorisées** :
|
**Valeurs autorisées** :
|
||||||
|
|
||||||
| Valeur | Description |
|
| Valeur | Description |
|
||||||
@@ -115,13 +115,13 @@ Ce document recense **toutes les valeurs énumérées** utilisées dans la base
|
|||||||
| `conge_am` | Congé de l’assistante maternelle |
|
| `conge_am` | Congé de l’assistante maternelle |
|
||||||
| `arret_maladie_am` | Arrêt maladie AM |
|
| `arret_maladie_am` | Arrêt maladie AM |
|
||||||
|
|
||||||
> Remplace l’ancien enum `type_evenement_type` / table `evenements` (supprimés ticket #193).
|
> Remplace l’ancien enum `type_evenement_type` / table `evenements` (supprimés ticket #205 / ex-#193).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 8) Statut d’absence de garde — `statut`
|
## 8) Statut d’absence de garde — `statut`
|
||||||
|
|
||||||
**Tables/colonnes** : `absences_garde.statut`
|
**Tables/colonnes** : `evenements_agenda.statut`
|
||||||
**Valeurs autorisées** :
|
**Valeurs autorisées** :
|
||||||
|
|
||||||
| Valeur | Description |
|
| Valeur | Description |
|
||||||
|
|||||||
@@ -42,8 +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 |
|
||||||
| **absences_garde(id_placement)** → `enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus d’absences |
|
| **evenements_agenda(id_placement)** → `enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus d’absences |
|
||||||
| **absences_garde(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver la période si user supprimé |
|
| **evenements_agenda(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver la période si user supprimé |
|
||||||
| **signalements_bugs(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Conserver le ticket même si compte supprimé |
|
| **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 |
|
||||||
@@ -77,8 +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
|
||||||
- `absences_garde.id_placement` → **CASCADE**
|
- `evenements_agenda.id_placement` → **CASCADE**
|
||||||
- `absences_garde.cree_par` → **SET NULL**
|
- `evenements_agenda.cree_par` → **SET NULL**
|
||||||
|
|
||||||
### Divers
|
### Divers
|
||||||
- `signalements_bugs.id_utilisateur` → **SET NULL**
|
- `signalements_bugs.id_utilisateur` → **SET NULL**
|
||||||
@@ -105,7 +105,7 @@ 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), `absences_garde` des placements du childA (CASCADE via EAM).
|
- Attendu : `enfants_parents` (CASCADE), `dossiers` du childA (CASCADE), `evenements_agenda` 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)`
|
||||||
|
|||||||
@@ -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,106 @@
|
|||||||
|
-- Ticket #205 — Renommer absences_garde → evenements_agenda
|
||||||
|
-- Migration base live. Idempotent autant que possible.
|
||||||
|
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
-- 1. Table + enums
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'absences_garde')
|
||||||
|
AND NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'evenements_agenda') THEN
|
||||||
|
ALTER TABLE absences_garde RENAME TO evenements_agenda;
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type')
|
||||||
|
AND NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_agenda_type') THEN
|
||||||
|
ALTER TYPE type_absence_garde_type RENAME TO type_evenement_agenda_type;
|
||||||
|
END IF;
|
||||||
|
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type')
|
||||||
|
AND NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_agenda_type') THEN
|
||||||
|
ALTER TYPE statut_absence_garde_type RENAME TO statut_evenement_agenda_type;
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
-- Contraintes / index (noms)
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'chk_absences_garde_dates') THEN
|
||||||
|
ALTER TABLE evenements_agenda RENAME CONSTRAINT chk_absences_garde_dates TO chk_evenements_agenda_dates;
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
ALTER INDEX IF EXISTS idx_absences_garde_placement_dates
|
||||||
|
RENAME TO idx_evenements_agenda_placement_dates;
|
||||||
|
ALTER INDEX IF EXISTS idx_absences_garde_placement_type_statut
|
||||||
|
RENAME TO idx_evenements_agenda_placement_type_statut;
|
||||||
|
ALTER INDEX IF EXISTS idx_absences_garde_expire_at
|
||||||
|
RENAME TO idx_evenements_agenda_expire_at;
|
||||||
|
ALTER INDEX IF EXISTS absences_garde_pkey
|
||||||
|
RENAME TO evenements_agenda_pkey;
|
||||||
|
|
||||||
|
COMMENT ON TABLE evenements_agenda IS
|
||||||
|
'Vérité métier agenda (absences, congés, arrêts, futurs soins/école/mairie/sorties…) par placement. Les cartes collectent ; cette table historise.';
|
||||||
|
COMMENT ON COLUMN evenements_agenda.expire_at IS
|
||||||
|
'Purge auto (job) pour en_attente/refuse. accepte → infinity.';
|
||||||
|
COMMENT ON COLUMN evenements_agenda.id_card_instance IS
|
||||||
|
'Réf. carte de collecte (module Cartes).';
|
||||||
|
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
-- 2. card_instances.id_absence → id_evenement
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF EXISTS (
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'card_instances' AND column_name = 'id_absence'
|
||||||
|
) AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'card_instances' AND column_name = 'id_evenement'
|
||||||
|
) THEN
|
||||||
|
ALTER TABLE card_instances RENAME COLUMN id_absence TO id_evenement;
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
-- Recréer index si ancien nom
|
||||||
|
ALTER INDEX IF EXISTS idx_card_instances_absence
|
||||||
|
RENAME TO idx_card_instances_evenement;
|
||||||
|
|
||||||
|
-- FK : drop ancienne (nom variable) puis recreate
|
||||||
|
DO $$
|
||||||
|
DECLARE
|
||||||
|
fk_name text;
|
||||||
|
BEGIN
|
||||||
|
SELECT conname INTO fk_name
|
||||||
|
FROM pg_constraint
|
||||||
|
WHERE conrelid = 'card_instances'::regclass
|
||||||
|
AND contype = 'f'
|
||||||
|
AND pg_get_constraintdef(oid) ILIKE '%id_evenement%'
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
IF fk_name IS NULL THEN
|
||||||
|
SELECT conname INTO fk_name
|
||||||
|
FROM pg_constraint
|
||||||
|
WHERE conrelid = 'card_instances'::regclass
|
||||||
|
AND contype = 'f'
|
||||||
|
AND pg_get_constraintdef(oid) ILIKE '%id_absence%'
|
||||||
|
LIMIT 1;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
IF fk_name IS NOT NULL THEN
|
||||||
|
EXECUTE format('ALTER TABLE card_instances DROP CONSTRAINT %I', fk_name);
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
IF NOT EXISTS (
|
||||||
|
SELECT 1 FROM pg_constraint
|
||||||
|
WHERE conname = 'card_instances_id_evenement_fkey'
|
||||||
|
) THEN
|
||||||
|
ALTER TABLE card_instances
|
||||||
|
ADD CONSTRAINT card_instances_id_evenement_fkey
|
||||||
|
FOREIGN KEY (id_evenement)
|
||||||
|
REFERENCES evenements_agenda(id)
|
||||||
|
ON DELETE SET NULL;
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
@@ -81,7 +81,7 @@ ORDER BY c.cree_le DESC;
|
|||||||
|
|
||||||
\echo '=== 9) Absences_garde (30 derniers jours) ====================='
|
\echo '=== 9) Absences_garde (30 derniers jours) ====================='
|
||||||
SELECT ag.id, ag.type, ag.id_placement, ag.date_debut, ag.date_fin, ag.statut, ag.expire_at
|
SELECT ag.id, ag.type, ag.id_placement, ag.date_debut, ag.date_fin, ag.statut, ag.expire_at
|
||||||
FROM absences_garde ag
|
FROM evenements_agenda ag
|
||||||
WHERE ag.date_debut >= (NOW()::date - INTERVAL '30 days')
|
WHERE ag.date_debut >= (NOW()::date - INTERVAL '30 days')
|
||||||
ORDER BY ag.date_debut DESC;
|
ORDER BY ag.date_debut DESC;
|
||||||
|
|
||||||
@@ -136,7 +136,7 @@ WHERE c.id IS NULL;
|
|||||||
|
|
||||||
-- Absences sans placement
|
-- Absences sans placement
|
||||||
SELECT ag.*
|
SELECT ag.*
|
||||||
FROM absences_garde ag
|
FROM evenements_agenda ag
|
||||||
LEFT JOIN enfants_assistantes_maternelles eam ON eam.id = ag.id_placement
|
LEFT JOIN enfants_assistantes_maternelles eam ON eam.id = ag.id_placement
|
||||||
WHERE eam.id IS NULL;
|
WHERE eam.id IS NULL;
|
||||||
|
|
||||||
@@ -150,10 +150,10 @@ 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;
|
||||||
|
|
||||||
-- Absences par placement et période (idx_absences_garde_placement_dates)
|
-- Absences par placement et période (idx_evenements_agenda_placement_dates)
|
||||||
EXPLAIN ANALYZE
|
EXPLAIN ANALYZE
|
||||||
SELECT ag.*
|
SELECT ag.*
|
||||||
FROM absences_garde ag
|
FROM evenements_agenda ag
|
||||||
WHERE ag.id_placement IS NOT NULL
|
WHERE ag.id_placement IS NOT NULL
|
||||||
AND ag.date_debut >= '2025-01-01';
|
AND ag.date_debut >= '2025-01-01';
|
||||||
|
|
||||||
@@ -198,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 absences_garde) AS nb_absences_garde,
|
(SELECT COUNT(*) FROM evenements_agenda) AS nb_evenements_agenda,
|
||||||
(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;
|
||||||
|
|||||||
@@ -572,14 +572,22 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
|||||||
|
|
||||||
### 32. Module Absences + Cartes (séparation back / collecte)
|
### 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.
|
**Décision** : ✅ **Back `evenements_agenda` = vérité métier / agenda** ; **Cartes = file d’attention** (plugin isolé). Types SYSTEM (absence, congé, arrêt) indéboulonnables ; types OPTIONNELS (sondages, soins enfant, école, mairie, sorties…) plus tard. Annulation = DELETE. `expire_at` dès V1.
|
||||||
|
|
||||||
**Justification** :
|
**Justification** :
|
||||||
- Premier vrai module d’interaction multi-acteurs
|
- Premier vrai module d’interaction multi-acteurs
|
||||||
- Évite de stocker l’historique congés dans des bulles éphémères
|
- Évite de stocker l’historique dans des bulles éphémères
|
||||||
- Portabilité / généricité des cartes sans coupler le métier garde
|
- Portabilité / généricité des cartes sans coupler le métier
|
||||||
|
- **Différence avec le blog** : les cartes du fil = **événements d’agenda** (période + placement + historique) ; le blog = récit narratif du jour
|
||||||
|
|
||||||
**Flux V1** : BDD absences → API liste/CRUD → module Cartes SYSTEM → front bulles (séparé).
|
**Modèle données** :
|
||||||
|
- Table **`evenements_agenda`** (ex-`absences_garde`, rename [#205](https://git.ptits-pas.fr/jmartin/petitspas/issues/205)) — nom volontairement ouvert
|
||||||
|
|
||||||
|
**UI** : la **couleur** des bulles est un mapping **front** (`type_code` → teinte). L’API n’expose pas `couleur`.
|
||||||
|
|
||||||
|
**Flux V1** : BDD agenda → API liste/CRUD → module Cartes SYSTEM → front bulles (séparé).
|
||||||
|
|
||||||
|
**Réf. détail** : `docs/32_MINI-SPEC-BULLES-CARTES.md`
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -615,7 +623,7 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
|||||||
| 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) |
|
||||||
| 24/09/2026 | 1.4 | Décision 32 — Absences (`absences_garde`) ≠ Cartes ; Epic C recentré ; drop `evenements` |
|
| 24/09/2026 | 1.4 | Décision 32 — Absences (`evenements_agenda`) ≠ Cartes ; Epic C recentré ; drop `evenements` |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -98,16 +98,16 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
|||||||
|
|
||||||
## Epic C — Absences + Cartes (file d’attention)
|
## 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.
|
**Séparation :** back **`evenements_agenda`** = vérité métier (périodes / placement) ; module **Cartes** = collecte / bulles / workflow. Annulation = DELETE. `expire_at` dès le modèle.
|
||||||
|
|
||||||
### Back (ordre)
|
### Back (ordre)
|
||||||
|
|
||||||
| Étape | Contenu |
|
| Étape | Contenu |
|
||||||
|-------|---------|
|
|-------|---------|
|
||||||
| BDD | Table `absences_garde` + drop `evenements` |
|
| BDD | Table `evenements_agenda` + drop `evenements` |
|
||||||
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
||||||
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
||||||
| Realtime | WS/SSE bulles |
|
| Realtime | WS/SSE bulles → **SSE** `GET /cards/stream` (#195) |
|
||||||
| Purge TTL | Job `expire_at` / `purge_at` |
|
| Purge TTL | Job `expire_at` / `purge_at` |
|
||||||
|
|
||||||
### Front (après API — hors chantier back immédiat)
|
### Front (après API — hors chantier back immédiat)
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ Bandeau : **TdB** · **Agenda** · **Contrat** · menu user (recherche AM, param
|
|||||||
| Maladie AM | AM | Parent **ack** (« bien reçu ») ; **aucun** doc médical |
|
| Maladie AM | AM | Parent **ack** (« bien reçu ») ; **aucun** doc médical |
|
||||||
| Sortie / sondage | — | **Plus tard** (types optionnels) |
|
| 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.
|
**Stockage :** table `evenements_agenda` (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).
|
**Péremption cartes :** mémoire courte (`retention_days` / `purge_at`) — pas un historique de vie (≠ messagerie).
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ Avec données peuplées, sur au moins 2 supports :
|
|||||||
|
|
||||||
- Parent : `frontend/lib/screens/home/parent_screen/ParentDashboardScreen.dart` + `dashbord_parent/`
|
- Parent : `frontend/lib/screens/home/parent_screen/ParentDashboardScreen.dart` + `dashbord_parent/`
|
||||||
- AM : `frontend/lib/screens/am/am_dashboard_screen.dart` (placeholder)
|
- AM : `frontend/lib/screens/am/am_dashboard_screen.dart` (placeholder)
|
||||||
- Cartes couleurs : `frontend/assets/cards/` (7 teintes max)
|
- Cartes couleurs : `frontend/assets/cards/` (8 teintes max)
|
||||||
|
|
||||||
## 9. Ordre de build suggéré
|
## 9. Ordre de build suggéré
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,184 @@
|
|||||||
|
# Mini-spec · Bulles / file d’attention (#173)
|
||||||
|
|
||||||
|
*Front · octobre 2026 — alignement product / API.*
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Contexte / objectif
|
||||||
|
|
||||||
|
Les bulles (cartes) sont la **file d’attention** du quotidien parent / AM : décisions et infos proches (congés, arrêt maladie AM, absences, soins / bobos enfant…).
|
||||||
|
|
||||||
|
**Différence fondamentale avec le blog :**
|
||||||
|
les cartes de ce fil sont des **événements d’agenda** (période, placement, historique métier loggé).
|
||||||
|
Le **blog** = récit / mémoire narrative du jour (photos, texte) — pas une ligne d’agenda.
|
||||||
|
|
||||||
|
Les cartes restent une **mémoire courte** de file (`purge_at` sur la bulle) ; la **source de vérité agenda** reste le back métier.
|
||||||
|
|
||||||
|
Table agenda : **`evenements_agenda`** (ex-`absences_garde`, [#205](https://git.ptits-pas.fr/jmartin/petitspas/issues/205) fait) — conteneur ouvert (absences, congés, soins, école, mairie, sorties…). Les bulles notifient ; l’agenda historise.
|
||||||
|
|
||||||
|
Voir aussi `31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md`.
|
||||||
|
|
||||||
|
Cette note formalise :
|
||||||
|
1. Ce qui est en place côté front (#173).
|
||||||
|
2. Le contrat API (sans couleur).
|
||||||
|
3. La **palette UI** (front only, dérivée du `type_code`).
|
||||||
|
4. La nouvelle famille **soins / bobo enfant** (rose) — AM → parents.
|
||||||
|
5. Idées futures.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Contrat API
|
||||||
|
|
||||||
|
Endpoint principal : `GET /api/v1/cards` (filtre couple / placement).
|
||||||
|
|
||||||
|
| Champ | Rôle UI |
|
||||||
|
|-------|---------|
|
||||||
|
| `type_code` | Layout + libellé + **couleur / icône (mapping front)** |
|
||||||
|
| `titre` | Fallback si `type_code` inconnu |
|
||||||
|
| `statut` | `ouverte` · `refusee` · `traitee` |
|
||||||
|
| `response_mode` | `none` · `ack` · `accept_refuse` |
|
||||||
|
| `is_creator` | Masque les boutons réponse pour le créateur |
|
||||||
|
| `payload.date_debut` / `date_fin` | Période (agenda) |
|
||||||
|
| `payload.motif` | Texte libre / détail |
|
||||||
|
| `last_refuse_comment` | Si `refusee` |
|
||||||
|
| `id_absence` | Lien métier agenda (si applicable) |
|
||||||
|
| `purge_at` | Péremption de la bulle dans la file |
|
||||||
|
|
||||||
|
**Pas de champ `couleur` dans l’API.**
|
||||||
|
La teinte pastel est **100 % front** : table de mapping `type_code` → asset (`card_*_h.png`). Le back ne gère pas la charte graphique.
|
||||||
|
|
||||||
|
**Règle front :** le destinataire peut répondre si `!is_creator && statut == ouverte && response_mode != none`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Évolutions front déjà livrées (#173)
|
||||||
|
|
||||||
|
### 3.1 Feed
|
||||||
|
|
||||||
|
- Widget partagé `CartesFeed` (parent + AM).
|
||||||
|
- Fond via widget `Carte` (9-slice horizontal) selon mapping local.
|
||||||
|
- Actions via **modales** accepter / refuser / ack.
|
||||||
|
- Libellés UI :
|
||||||
|
- `conge_am` → « Demande de congés »
|
||||||
|
- `arret_maladie_am` → « Arrêt maladie »
|
||||||
|
- `absence_enfant` (+ `_modif`) → « Notification d’absence »
|
||||||
|
|
||||||
|
### 3.2 Carte **congés** (`conge_am`)
|
||||||
|
|
||||||
|
| Élément | Comportement |
|
||||||
|
|---------|----------------|
|
||||||
|
| Fond | **Aqua** (mapping front) |
|
||||||
|
| Encre | Pétrole `#315F63` / dates `#4A7276` |
|
||||||
|
| Icône | Valise |
|
||||||
|
| Période | « Du … au … » + calendrier |
|
||||||
|
| Actions | Pilules ✓ / ✕ si `accept_refuse` |
|
||||||
|
| Lien | « Ouvrir dans l’agenda ↗ » |
|
||||||
|
| Opacité | Atténuée si `traitee` (sauf règle arrêt ci-dessous) |
|
||||||
|
|
||||||
|
### 3.3 Arrêt maladie AM (`arret_maladie_am`)
|
||||||
|
|
||||||
|
- Reste **visible / opaque** tant que `date_fin` (jour inclus) n’est pas passée, même si `traitee`.
|
||||||
|
- Fond **bleu** (mapping front).
|
||||||
|
|
||||||
|
### 3.4 Assets
|
||||||
|
|
||||||
|
Teintes UI : `red` · `pink` · `peach` · `lime` · `lavender` · `green` · `blue` · `aqua`.
|
||||||
|
Clé = **choix front**, pas une valeur API.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Palette UI (front only — dérivée du `type_code`)
|
||||||
|
|
||||||
|
| Couleur UI | Famille | Types |
|
||||||
|
|------------|---------|--------|
|
||||||
|
| **`aqua`** | Congés AM | `conge_am` |
|
||||||
|
| **`blue`** | Arrêt maladie AM | `arret_maladie_am` |
|
||||||
|
| **`peach`** | Absence enfant / info pratique | `absence_enfant`, `absence_enfant_modif` |
|
||||||
|
| **`pink`** | Soins / bobo / problème **enfant** (AM → parents) | `soin_enfant` *(nouveau — voir §5)* |
|
||||||
|
| **`lavender`** | Admin / divers | futurs types admin |
|
||||||
|
|
||||||
|
**Principes**
|
||||||
|
|
||||||
|
- Couleur = famille visuelle (lisible sans tout lire).
|
||||||
|
- Icône précise l’événement (surtout sur rose : thermomètre, pansement, flacon…).
|
||||||
|
- Rose = doux / rassurant, **pas** une alerte médicale forte.
|
||||||
|
- Congés ≠ lavande (trop « admin »).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Nouvelle bulle rose — soins / bobo enfant (AM → parents)
|
||||||
|
|
||||||
|
### Intention produit
|
||||||
|
|
||||||
|
La nounou signale un **événement concernant l’enfant** (maladie légère, bobo, crème, température, souci du jour…) **vers les parents**.
|
||||||
|
|
||||||
|
Pourquoi **pas seulement la messagerie** ?
|
||||||
|
- C’est **loggé** dans la file d’attention.
|
||||||
|
- C’est un **événement d’agenda** (période / jour, placement, historique).
|
||||||
|
- Les parents peuvent **acquitter** (`ack`) sans noyer le chat.
|
||||||
|
|
||||||
|
### Proposition V1 (à brancher ultérieurement)
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|--|--|
|
||||||
|
| `type_code` | `soin_enfant` (nom exact à figer) |
|
||||||
|
| Émetteur | AM |
|
||||||
|
| Destinataires | parents du couple / placement |
|
||||||
|
| `response_mode` | `ack` |
|
||||||
|
| Couleur UI | `pink` |
|
||||||
|
| Back métier | ligne agenda liée (même esprit que `absences_garde` : période + placement + motif) ; la bulle = collecte / notification |
|
||||||
|
| Payload | `date_debut` / `date_fin` (+ motif / sous-type optionnel : temperature, bobo, medicament…) |
|
||||||
|
|
||||||
|
**Hors scope immédiat #173** : implémentation complète ; cette section fige l’intention pour le contrat types + UI.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Idées futures (hors scope)
|
||||||
|
|
||||||
|
| Famille | Couleur UI | Exemples | `response_mode` |
|
||||||
|
|---------|------------|----------|-----------------|
|
||||||
|
| Soins (détail) | `pink` | `soin_temperature`, `soin_medicament`, `soin_bobo` — ou sous-types dans payload | `ack` |
|
||||||
|
| Sortie | `peach` / `lavender` | `sortie_a_valider` | `accept_refuse` |
|
||||||
|
| Admin | `lavender` | `info_admin`, `document_a_fournir` | `ack` / `none` |
|
||||||
|
|
||||||
|
Variante soins : un seul fond rose ; l’icône / sous-type change.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. Comportements métier à ne pas casser
|
||||||
|
|
||||||
|
- Créateur : pas de boutons réponse ; éventuel « En attente de réponse ».
|
||||||
|
- Refus : afficher `last_refuse_comment`.
|
||||||
|
- Congé : `accept_refuse` côté destinataire.
|
||||||
|
- Absence enfant : info / ack — pas de veto AM en V1.
|
||||||
|
- File courte : `purge_at` ; l’**agenda** conserve l’historique métier.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. Fichiers front de référence
|
||||||
|
|
||||||
|
- `frontend/lib/models/carte_bulle.dart` — mapping type → libellé / icône / fond
|
||||||
|
- `frontend/lib/widgets/quotidien/cartes_feed.dart`
|
||||||
|
- `frontend/lib/models/card_assets.dart`
|
||||||
|
- Assets : `frontend/assets/cards/`, `valise.png`, `btn_*_pilule.png`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. Recettes
|
||||||
|
|
||||||
|
- [ ] API cartes **sans** champ `couleur` (ni feed ni `/types`).
|
||||||
|
- [ ] Front mappe `conge_am` → aqua, `arret_maladie_am` → blue, `absence_*` → peach.
|
||||||
|
- [ ] Accept / refuse congé OK.
|
||||||
|
- [ ] Arrêt traité + période en cours → reste visible.
|
||||||
|
- [ ] Filtre couple / placement.
|
||||||
|
- [ ] (Plus tard) `soin_enfant` rose AM → parents + ligne agenda.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 10. Références
|
||||||
|
|
||||||
|
- Ticket front : **#173**
|
||||||
|
- Module cartes : **#194**
|
||||||
|
- Quotidien : `docs/31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md`
|
||||||
|
- Décision projet : `docs/24_DECISIONS-PROJET.md` §32
|
||||||
|
- Maquette congés : `ressources/bulle_congés.jpg`
|
||||||
@@ -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: 741 KiB |
|
After Width: | Height: | Size: 692 KiB |
|
After Width: | Height: | Size: 785 KiB |
|
Before Width: | Height: | Size: 261 KiB |
|
After Width: | Height: | Size: 195 KiB |
|
After Width: | Height: | Size: 231 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 591 KiB |
|
After Width: | Height: | Size: 683 KiB |
|
After Width: | Height: | Size: 1.2 MiB |
|
After Width: | Height: | Size: 1.1 MiB |
|
After Width: | Height: | Size: 365 KiB |
|
Before Width: | Height: | Size: 276 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'] ?? '',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,7 +5,8 @@ enum CardColorVertical {
|
|||||||
lime('assets/cards/card_lime.png'),
|
lime('assets/cards/card_lime.png'),
|
||||||
lavender('assets/cards/card_lavender.png'),
|
lavender('assets/cards/card_lavender.png'),
|
||||||
green('assets/cards/card_green.png'),
|
green('assets/cards/card_green.png'),
|
||||||
blue('assets/cards/card_blue.png');
|
blue('assets/cards/card_blue.png'),
|
||||||
|
aqua('assets/cards/card_aqua.png');
|
||||||
|
|
||||||
final String path;
|
final String path;
|
||||||
const CardColorVertical(this.path);
|
const CardColorVertical(this.path);
|
||||||
@@ -18,7 +19,8 @@ enum CardColorHorizontal {
|
|||||||
lime('assets/cards/card_lime_h.png'),
|
lime('assets/cards/card_lime_h.png'),
|
||||||
lavender('assets/cards/card_lavender_h.png'),
|
lavender('assets/cards/card_lavender_h.png'),
|
||||||
green('assets/cards/card_green_h.png'),
|
green('assets/cards/card_green_h.png'),
|
||||||
blue('assets/cards/card_blue_h.png');
|
blue('assets/cards/card_blue_h.png'),
|
||||||
|
aqua('assets/cards/card_aqua_h.png');
|
||||||
|
|
||||||
final String path;
|
final String path;
|
||||||
const CardColorHorizontal(this.path);
|
const CardColorHorizontal(this.path);
|
||||||
|
|||||||
@@ -0,0 +1,196 @@
|
|||||||
|
import 'package:p_tits_pas/models/card_assets.dart';
|
||||||
|
|
||||||
|
/// Statut d'une instance de carte (file d'attention) — contrat #194 / #173.
|
||||||
|
enum CarteStatut {
|
||||||
|
ouverte('ouverte'),
|
||||||
|
refusee('refusee'),
|
||||||
|
traitee('traitee');
|
||||||
|
|
||||||
|
final String apiValue;
|
||||||
|
const CarteStatut(this.apiValue);
|
||||||
|
|
||||||
|
static CarteStatut fromApi(String? raw) {
|
||||||
|
switch (raw) {
|
||||||
|
case 'refusee':
|
||||||
|
return CarteStatut.refusee;
|
||||||
|
case 'traitee':
|
||||||
|
return CarteStatut.traitee;
|
||||||
|
case 'ouverte':
|
||||||
|
default:
|
||||||
|
return CarteStatut.ouverte;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Mode de réponse attendu selon le type SYSTEM.
|
||||||
|
enum CarteResponseMode {
|
||||||
|
none('none'),
|
||||||
|
ack('ack'),
|
||||||
|
acceptRefuse('accept_refuse');
|
||||||
|
|
||||||
|
final String apiValue;
|
||||||
|
const CarteResponseMode(this.apiValue);
|
||||||
|
|
||||||
|
static CarteResponseMode fromApi(String? raw) {
|
||||||
|
switch (raw) {
|
||||||
|
case 'ack':
|
||||||
|
return CarteResponseMode.ack;
|
||||||
|
case 'accept_refuse':
|
||||||
|
return CarteResponseMode.acceptRefuse;
|
||||||
|
case 'none':
|
||||||
|
default:
|
||||||
|
return CarteResponseMode.none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Bulle / carte de la file d'attention.
|
||||||
|
class CarteBulle {
|
||||||
|
final String id;
|
||||||
|
final String typeCode;
|
||||||
|
final String titre;
|
||||||
|
final String idPlacement;
|
||||||
|
final String? idAbsence;
|
||||||
|
final String operation;
|
||||||
|
final CarteStatut statut;
|
||||||
|
final Map<String, dynamic> payload;
|
||||||
|
final DateTime? purgeAt;
|
||||||
|
final String? creePar;
|
||||||
|
final bool isCreator;
|
||||||
|
final CarteResponseMode responseMode;
|
||||||
|
final String? lastRefuseComment;
|
||||||
|
final DateTime? creeLe;
|
||||||
|
final DateTime? modifieLe;
|
||||||
|
|
||||||
|
const CarteBulle({
|
||||||
|
required this.id,
|
||||||
|
required this.typeCode,
|
||||||
|
required this.titre,
|
||||||
|
required this.idPlacement,
|
||||||
|
this.idAbsence,
|
||||||
|
this.operation = 'create',
|
||||||
|
required this.statut,
|
||||||
|
this.payload = const {},
|
||||||
|
this.purgeAt,
|
||||||
|
this.creePar,
|
||||||
|
this.isCreator = false,
|
||||||
|
this.responseMode = CarteResponseMode.none,
|
||||||
|
this.lastRefuseComment,
|
||||||
|
this.creeLe,
|
||||||
|
this.modifieLe,
|
||||||
|
});
|
||||||
|
|
||||||
|
String? get dateDebut => payload['date_debut']?.toString();
|
||||||
|
String? get dateFin => payload['date_fin']?.toString();
|
||||||
|
String? get motif => payload['motif']?.toString();
|
||||||
|
|
||||||
|
/// Libellé UI (sémantique produit) — pas le titre brut API.
|
||||||
|
String get titreAffiche {
|
||||||
|
switch (typeCode) {
|
||||||
|
case 'conge_am':
|
||||||
|
return 'Demande de congés';
|
||||||
|
case 'arret_maladie_am':
|
||||||
|
return 'Arrêt maladie';
|
||||||
|
case 'absence_enfant':
|
||||||
|
case 'absence_enfant_modif':
|
||||||
|
return 'Notification d’absence';
|
||||||
|
case 'soin_enfant':
|
||||||
|
return 'Soin / bobo';
|
||||||
|
default:
|
||||||
|
return titre;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool get isArretMaladie => typeCode == 'arret_maladie_am';
|
||||||
|
bool get isCongeAm => typeCode == 'conge_am';
|
||||||
|
bool get isSoinEnfant => typeCode == 'soin_enfant';
|
||||||
|
|
||||||
|
/// Icône dessin (haut droite) selon le type de bulle.
|
||||||
|
String? get iconAsset {
|
||||||
|
switch (typeCode) {
|
||||||
|
case 'conge_am':
|
||||||
|
return 'assets/images/valise.png';
|
||||||
|
case 'arret_maladie_am':
|
||||||
|
return 'assets/images/cartes/icon_carte_maladie.png';
|
||||||
|
case 'absence_enfant':
|
||||||
|
case 'absence_enfant_modif':
|
||||||
|
return 'assets/images/cartes/icon_carte_absence.png';
|
||||||
|
// soin_enfant : icône selon sous-type payload — à brancher plus tard
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Fin de période (jour inclus). Null si dates absentes / invalides.
|
||||||
|
DateTime? get dateFinJour {
|
||||||
|
final raw = dateFin;
|
||||||
|
if (raw == null || raw.isEmpty) return null;
|
||||||
|
final dt = DateTime.tryParse(raw);
|
||||||
|
if (dt == null) return null;
|
||||||
|
return DateTime(dt.year, dt.month, dt.day);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Vrai tant que la date de fin n’est pas dépassée (jour courant inclus).
|
||||||
|
bool get periodeEncoreActive {
|
||||||
|
final fin = dateFinJour;
|
||||||
|
if (fin == null) return true;
|
||||||
|
final today = DateTime.now();
|
||||||
|
final todayDay = DateTime(today.year, today.month, today.day);
|
||||||
|
return !todayDay.isAfter(fin);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Teinte pastel UI dérivée du `type_code` (pas de `couleur` API).
|
||||||
|
/// Voir `docs/32_MINI-SPEC-BULLES-CARTES.md` §4.
|
||||||
|
CardColorHorizontal get colorFamily {
|
||||||
|
switch (typeCode) {
|
||||||
|
case 'conge_am':
|
||||||
|
return CardColorHorizontal.aqua;
|
||||||
|
case 'arret_maladie_am':
|
||||||
|
return CardColorHorizontal.blue;
|
||||||
|
case 'absence_enfant':
|
||||||
|
case 'absence_enfant_modif':
|
||||||
|
return CardColorHorizontal.peach;
|
||||||
|
case 'soin_enfant':
|
||||||
|
return CardColorHorizontal.pink;
|
||||||
|
default:
|
||||||
|
return CardColorHorizontal.lavender;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Asset horizontal pastel (palette `assets/cards/` uniquement).
|
||||||
|
String get backgroundAsset => colorFamily.path;
|
||||||
|
|
||||||
|
/// Le destinataire peut répondre (pas le créateur, carte ouverte).
|
||||||
|
bool get peutRepondre =>
|
||||||
|
!isCreator &&
|
||||||
|
statut == CarteStatut.ouverte &&
|
||||||
|
responseMode != CarteResponseMode.none;
|
||||||
|
|
||||||
|
factory CarteBulle.fromJson(Map<String, dynamic> json) {
|
||||||
|
final rawPayload = json['payload'];
|
||||||
|
return CarteBulle(
|
||||||
|
id: (json['id'] ?? '').toString(),
|
||||||
|
typeCode: (json['type_code'] ?? '').toString(),
|
||||||
|
titre: (json['titre'] ?? json['type_code'] ?? 'Carte').toString(),
|
||||||
|
idPlacement: (json['id_placement'] ?? '').toString(),
|
||||||
|
idAbsence: json['id_absence']?.toString(),
|
||||||
|
operation: (json['operation'] ?? 'create').toString(),
|
||||||
|
statut: CarteStatut.fromApi(json['statut']?.toString()),
|
||||||
|
payload: rawPayload is Map
|
||||||
|
? Map<String, dynamic>.from(rawPayload)
|
||||||
|
: const {},
|
||||||
|
purgeAt: _parseDate(json['purge_at']),
|
||||||
|
creePar: json['cree_par']?.toString(),
|
||||||
|
isCreator: json['is_creator'] == true,
|
||||||
|
responseMode: CarteResponseMode.fromApi(json['response_mode']?.toString()),
|
||||||
|
lastRefuseComment: json['last_refuse_comment']?.toString(),
|
||||||
|
creeLe: _parseDate(json['cree_le']),
|
||||||
|
modifieLe: _parseDate(json['modifie_le']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static DateTime? _parseDate(dynamic v) {
|
||||||
|
if (v == null) return null;
|
||||||
|
return DateTime.tryParse(v.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -39,13 +39,15 @@ class CoupleMembre {
|
|||||||
class CoupleGarde {
|
class CoupleGarde {
|
||||||
final String id;
|
final String id;
|
||||||
final CoupleMembre enfant;
|
final CoupleMembre enfant;
|
||||||
final CoupleMembre am;
|
final CoupleMembre? am;
|
||||||
|
final List<CoupleMembre> parents;
|
||||||
final bool courant;
|
final bool courant;
|
||||||
|
|
||||||
const CoupleGarde({
|
const CoupleGarde({
|
||||||
required this.id,
|
required this.id,
|
||||||
required this.enfant,
|
required this.enfant,
|
||||||
required this.am,
|
this.am,
|
||||||
|
this.parents = const [],
|
||||||
this.courant = false,
|
this.courant = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -55,9 +57,15 @@ class CoupleGarde {
|
|||||||
enfant: CoupleMembre.fromJson(
|
enfant: CoupleMembre.fromJson(
|
||||||
Map<String, dynamic>.from(json['enfant'] ?? const {}),
|
Map<String, dynamic>.from(json['enfant'] ?? const {}),
|
||||||
),
|
),
|
||||||
am: CoupleMembre.fromJson(
|
am: json['am'] != null
|
||||||
Map<String, dynamic>.from(json['am'] ?? const {}),
|
? CoupleMembre.fromJson(Map<String, dynamic>.from(json['am']))
|
||||||
),
|
: null,
|
||||||
|
parents: json['parents'] != null
|
||||||
|
? (json['parents'] as List)
|
||||||
|
.whereType<Map>()
|
||||||
|
.map((e) => CoupleMembre.fromJson(Map<String, dynamic>.from(e)))
|
||||||
|
.toList()
|
||||||
|
: const [],
|
||||||
courant: json['courant'] == true,
|
courant: json['courant'] == true,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -67,6 +75,7 @@ class CoupleGarde {
|
|||||||
id: id,
|
id: id,
|
||||||
enfant: enfant,
|
enfant: enfant,
|
||||||
am: am,
|
am: am,
|
||||||
|
parents: parents,
|
||||||
courant: courant ?? this.courant,
|
courant: courant ?? this.courant,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:p_tits_pas/models/couple_garde.dart';
|
||||||
import 'package:p_tits_pas/models/user.dart';
|
import 'package:p_tits_pas/models/user.dart';
|
||||||
import 'package:p_tits_pas/services/auth_service.dart';
|
import 'package:p_tits_pas/services/auth_service.dart';
|
||||||
import 'package:p_tits_pas/widgets/app_footer.dart';
|
import 'package:p_tits_pas/services/couple_garde_service.dart';
|
||||||
import 'package:p_tits_pas/widgets/dashboard/dashboard_bandeau.dart';
|
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
|
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
|
||||||
|
|
||||||
/// Dashboard assistante maternelle – page blanche avec bandeau générique.
|
/// Dashboard assistante maternelle – coquille 3 colonnes quotidien (#169).
|
||||||
/// Contenu détaillé à venir.
|
/// Colonne gauche : sélecteur de couple enfant–parent(s) (#170).
|
||||||
|
/// Métier cartes / blog / messagerie : tickets C/D/E.
|
||||||
class AmDashboardScreen extends StatefulWidget {
|
class AmDashboardScreen extends StatefulWidget {
|
||||||
const AmDashboardScreen({super.key});
|
const AmDashboardScreen({super.key});
|
||||||
|
|
||||||
@@ -14,13 +19,19 @@ class AmDashboardScreen extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _AmDashboardScreenState extends State<AmDashboardScreen> {
|
class _AmDashboardScreenState extends State<AmDashboardScreen> {
|
||||||
int selectedTabIndex = 0;
|
QuotidienNavSection _section = QuotidienNavSection.liaison;
|
||||||
AppUser? _user;
|
AppUser? _user;
|
||||||
|
|
||||||
|
List<CoupleGarde> _couples = const [];
|
||||||
|
String? _selectedCoupleId;
|
||||||
|
bool _couplesLoading = true;
|
||||||
|
String? _couplesError;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_loadUser();
|
_loadUser();
|
||||||
|
_loadCouples();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _loadUser() async {
|
Future<void> _loadUser() async {
|
||||||
@@ -28,51 +39,150 @@ class _AmDashboardScreenState extends State<AmDashboardScreen> {
|
|||||||
if (mounted) setState(() => _user = user);
|
if (mounted) setState(() => _user = user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _loadCouples() async {
|
||||||
|
setState(() {
|
||||||
|
_couplesLoading = true;
|
||||||
|
_couplesError = null;
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
final res = await CoupleGardeService.getAmCouplesGarde();
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_couples = res.couples;
|
||||||
|
_selectedCoupleId = res.coupleCourant?.id;
|
||||||
|
_couplesLoading = false;
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_couplesError = e.toString().replaceFirst('Exception: ', '');
|
||||||
|
_couplesLoading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _selectCouple(CoupleGarde couple) async {
|
||||||
|
if (couple.id == _selectedCoupleId) return;
|
||||||
|
setState(() => _selectedCoupleId = couple.id);
|
||||||
|
try {
|
||||||
|
final res = await CoupleGardeService.definirAmCoupleCourant(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 d'enfant : "
|
||||||
|
'${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 'Assistante maternelle';
|
||||||
|
}
|
||||||
|
|
||||||
|
void _soon(String label) {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(content: Text('$label — à venir')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return QuotidienShell(
|
||||||
appBar: PreferredSize(
|
selectedSection: _section,
|
||||||
preferredSize: const Size.fromHeight(60.0),
|
onSectionSelected: (s) => setState(() => _section = s),
|
||||||
child: DashboardBandeau(
|
userDisplayName: _displayName,
|
||||||
tabItems: const [
|
userEmail: _user?.email,
|
||||||
DashboardTabItem(label: 'Mon tableau de bord'),
|
onProfileTap: () => _soon('Profil'),
|
||||||
DashboardTabItem(label: 'Paramètres'),
|
onSettingsTap: () => _soon('Paramètres'),
|
||||||
],
|
// L'AM n'a pas de bouton "Recherche AM" dans le bandeau
|
||||||
selectedTabIndex: selectedTabIndex,
|
onSearchAmTap: null,
|
||||||
onTabSelected: (index) => setState(() => selectedTabIndex = index),
|
leftColumn: _LeftColumn(
|
||||||
userDisplayName: _user?.fullName.isNotEmpty == true
|
couples: _couples,
|
||||||
? _user!.fullName
|
selectedCoupleId: _selectedCoupleId,
|
||||||
: 'Assistante maternelle',
|
loading: _couplesLoading,
|
||||||
userEmail: _user?.email,
|
error: _couplesError,
|
||||||
userRole: _user?.role,
|
onRetry: _loadCouples,
|
||||||
onProfileTap: () {
|
onCoupleSelected: _selectCouple,
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
|
||||||
const SnackBar(
|
|
||||||
content: Text('Modification du profil – à venir')),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
onSettingsTap: () {
|
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
|
||||||
const SnackBar(content: Text('Paramètres – à venir')),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
onLogout: () {},
|
|
||||||
showLogoutConfirmation: true,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
body: Column(
|
centerColumn: const QuotidienColumnPlaceholder(
|
||||||
|
title: 'Blog',
|
||||||
|
subtitle:
|
||||||
|
'Fil du quotidien (affichage par défaut)\n(à brancher — ticket #179).',
|
||||||
|
icon: Icons.auto_stories_outlined,
|
||||||
|
),
|
||||||
|
rightColumn: const QuotidienColumnPlaceholder(
|
||||||
|
title: 'Messagerie',
|
||||||
|
subtitle:
|
||||||
|
'Mess. Parents · Mess. RPE\n(à brancher — ticket #185).',
|
||||||
|
icon: Icons.chat_bubble_outline,
|
||||||
|
),
|
||||||
|
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
|
||||||
|
contratBody: const QuotidienStubPage(
|
||||||
|
title: 'Contrat',
|
||||||
|
message: 'Contrat — contenu à venir (stub #187).',
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _LeftColumn extends StatelessWidget {
|
||||||
|
final List<CoupleGarde> couples;
|
||||||
|
final String? selectedCoupleId;
|
||||||
|
final bool loading;
|
||||||
|
final String? error;
|
||||||
|
final VoidCallback onRetry;
|
||||||
|
final ValueChanged<CoupleGarde> onCoupleSelected;
|
||||||
|
|
||||||
|
const _LeftColumn({
|
||||||
|
required this.couples,
|
||||||
|
required this.selectedCoupleId,
|
||||||
|
required this.loading,
|
||||||
|
required this.error,
|
||||||
|
required this.onRetry,
|
||||||
|
required this.onCoupleSelected,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.all(14),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
CoupleSelectorBandeau(
|
||||||
child: Center(
|
mode: CoupleBandeauMode.assistanteMaternelle,
|
||||||
child: Text(
|
couples: couples,
|
||||||
'Dashboard AM – à venir',
|
selectedCoupleId: selectedCoupleId,
|
||||||
style: Theme.of(context).textTheme.titleLarge,
|
loading: loading,
|
||||||
),
|
errorMessage: error,
|
||||||
|
onRetry: onRetry,
|
||||||
|
onCoupleSelected: onCoupleSelected,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 14),
|
||||||
|
const Expanded(
|
||||||
|
child: QuotidienColumnPlaceholder(
|
||||||
|
title: 'Cartes',
|
||||||
|
subtitle:
|
||||||
|
'Absences, congés AM, sorties à valider\n(à brancher — ticket #174).',
|
||||||
|
icon: Icons.style_outlined,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const AppFooter(),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
|
|||||||
CardColorVertical.red,
|
CardColorVertical.red,
|
||||||
CardColorVertical.green,
|
CardColorVertical.green,
|
||||||
CardColorVertical.blue,
|
CardColorVertical.blue,
|
||||||
|
CardColorVertical.aqua,
|
||||||
];
|
];
|
||||||
|
|
||||||
// Garder une trace des couleurs déjà utilisées
|
// Garder une trace des couleurs déjà utilisées
|
||||||
|
|||||||
@@ -3,13 +3,14 @@ import 'package:p_tits_pas/models/couple_garde.dart';
|
|||||||
import 'package:p_tits_pas/models/user.dart';
|
import 'package:p_tits_pas/models/user.dart';
|
||||||
import 'package:p_tits_pas/services/auth_service.dart';
|
import 'package:p_tits_pas/services/auth_service.dart';
|
||||||
import 'package:p_tits_pas/services/couple_garde_service.dart';
|
import 'package:p_tits_pas/services/couple_garde_service.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/cartes_feed.dart';
|
||||||
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
|
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
|
||||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
|
||||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
|
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
|
||||||
|
|
||||||
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
|
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
|
||||||
/// Colonne gauche : sélecteur de couple enfant–nounou (#167).
|
/// Colonne gauche : sélecteur de couple (#167) + feed bulles (#173).
|
||||||
/// Métier cartes / blog / messagerie : tickets C/D/E.
|
|
||||||
class ParentDashboardScreen extends StatefulWidget {
|
class ParentDashboardScreen extends StatefulWidget {
|
||||||
const ParentDashboardScreen({super.key});
|
const ParentDashboardScreen({super.key});
|
||||||
|
|
||||||
@@ -62,7 +63,6 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
|
|
||||||
Future<void> _selectCouple(CoupleGarde couple) async {
|
Future<void> _selectCouple(CoupleGarde couple) async {
|
||||||
if (couple.id == _selectedCoupleId) return;
|
if (couple.id == _selectedCoupleId) return;
|
||||||
// Optimiste : on bascule tout de suite, l'API persiste ensuite.
|
|
||||||
setState(() => _selectedCoupleId = couple.id);
|
setState(() => _selectedCoupleId = couple.id);
|
||||||
try {
|
try {
|
||||||
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
|
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
|
||||||
@@ -115,6 +115,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
error: _couplesError,
|
error: _couplesError,
|
||||||
onRetry: _loadCouples,
|
onRetry: _loadCouples,
|
||||||
onCoupleSelected: _selectCouple,
|
onCoupleSelected: _selectCouple,
|
||||||
|
onAjouterBulle: () => _soon('Ajouter une bulle'),
|
||||||
),
|
),
|
||||||
centerColumn: const QuotidienColumnPlaceholder(
|
centerColumn: const QuotidienColumnPlaceholder(
|
||||||
title: 'Blog',
|
title: 'Blog',
|
||||||
@@ -128,10 +129,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
|
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
|
||||||
icon: Icons.chat_bubble_outline,
|
icon: Icons.chat_bubble_outline,
|
||||||
),
|
),
|
||||||
agendaBody: const QuotidienStubPage(
|
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
|
||||||
title: 'Agenda',
|
|
||||||
message: 'Agenda — contenu à venir (stub #187).',
|
|
||||||
),
|
|
||||||
contratBody: const QuotidienStubPage(
|
contratBody: const QuotidienStubPage(
|
||||||
title: 'Contrat',
|
title: 'Contrat',
|
||||||
message: 'Contrat — contenu à venir (stub #187).',
|
message: 'Contrat — contenu à venir (stub #187).',
|
||||||
@@ -140,7 +138,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173 à venir).
|
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173).
|
||||||
class _LeftColumn extends StatelessWidget {
|
class _LeftColumn extends StatelessWidget {
|
||||||
final List<CoupleGarde> couples;
|
final List<CoupleGarde> couples;
|
||||||
final String? selectedCoupleId;
|
final String? selectedCoupleId;
|
||||||
@@ -148,6 +146,7 @@ class _LeftColumn extends StatelessWidget {
|
|||||||
final String? error;
|
final String? error;
|
||||||
final VoidCallback onRetry;
|
final VoidCallback onRetry;
|
||||||
final ValueChanged<CoupleGarde> onCoupleSelected;
|
final ValueChanged<CoupleGarde> onCoupleSelected;
|
||||||
|
final VoidCallback onAjouterBulle;
|
||||||
|
|
||||||
const _LeftColumn({
|
const _LeftColumn({
|
||||||
required this.couples,
|
required this.couples,
|
||||||
@@ -156,6 +155,7 @@ class _LeftColumn extends StatelessWidget {
|
|||||||
required this.error,
|
required this.error,
|
||||||
required this.onRetry,
|
required this.onRetry,
|
||||||
required this.onCoupleSelected,
|
required this.onCoupleSelected,
|
||||||
|
required this.onAjouterBulle,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -174,12 +174,10 @@ class _LeftColumn extends StatelessWidget {
|
|||||||
onCoupleSelected: onCoupleSelected,
|
onCoupleSelected: onCoupleSelected,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 14),
|
const SizedBox(height: 14),
|
||||||
const Expanded(
|
Expanded(
|
||||||
child: QuotidienColumnPlaceholder(
|
child: CartesFeed(
|
||||||
title: 'Cartes',
|
placementId: selectedCoupleId,
|
||||||
subtitle:
|
onAjouterBulle: onAjouterBulle,
|
||||||
'Absences, congés AM, sorties à valider\n(à brancher — ticket #173).',
|
|
||||||
icon: Icons.style_outlined,
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -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 +
|
||||||
|
'/evenements-agenda' +
|
||||||
|
(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}/evenements-agenda');
|
||||||
|
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}/evenements-agenda/$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}/evenements-agenda/$id');
|
||||||
|
final res = await http.delete(uri, headers: headers);
|
||||||
|
if (res.statusCode != 204) {
|
||||||
|
throw Exception("Erreur de suppression d'absence : ${res.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -67,7 +67,11 @@ class ApiConfig {
|
|||||||
static const String parentsCoupleGardeCourant =
|
static const String parentsCoupleGardeCourant =
|
||||||
'/parents/me/couples-garde/courant';
|
'/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.
|
/// Couples de garde de l'AM connectée (#170 / #171).
|
||||||
|
static const String assistantesMaternellesCouplesGarde =
|
||||||
|
'/assistantes-maternelles/me/couples-garde';
|
||||||
|
static const String assistantesMaternellesCoupleGardeCourant =
|
||||||
|
'/assistantes-maternelles/me/couples-garde/courant';
|
||||||
static const String assistantesMaternellesDossier =
|
static const String assistantesMaternellesDossier =
|
||||||
'/assistantes-maternelles/dossier';
|
'/assistantes-maternelles/dossier';
|
||||||
static const String enfants = '/enfants';
|
static const String enfants = '/enfants';
|
||||||
@@ -89,6 +93,10 @@ class ApiConfig {
|
|||||||
static const String conversations = '/conversations';
|
static const String conversations = '/conversations';
|
||||||
static const String notifications = '/notifications';
|
static const String notifications = '/notifications';
|
||||||
|
|
||||||
|
/// File d'attention / bulles (#173 / #194).
|
||||||
|
static const String cards = '/cards';
|
||||||
|
static const String cardsStream = '/cards/stream';
|
||||||
|
|
||||||
// Headers
|
// Headers
|
||||||
static Map<String, String> get headers => {
|
static Map<String, String> get headers => {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
@@ -96,7 +104,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',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:p_tits_pas/models/carte_bulle.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/tokenService.dart';
|
||||||
|
|
||||||
|
/// Accès API Cartes (file d'attention) — tickets #173 / #194.
|
||||||
|
/// - GET /cards?placementId=
|
||||||
|
/// - POST /cards/:id/respond
|
||||||
|
class CardsService {
|
||||||
|
static Future<Map<String, String>> _headers() async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
return token != null
|
||||||
|
? ApiConfig.authHeaders(token)
|
||||||
|
: Map<String, String>.from(ApiConfig.headers);
|
||||||
|
}
|
||||||
|
|
||||||
|
static String _extractError(String body, String fallback) {
|
||||||
|
try {
|
||||||
|
final decoded = jsonDecode(body);
|
||||||
|
if (decoded is Map<String, dynamic>) {
|
||||||
|
final message = decoded['message'];
|
||||||
|
if (message is String && message.trim().isNotEmpty) {
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
if (message is Map && message['message'] is String) {
|
||||||
|
return message['message'] as String;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (_) {}
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Feed de bulles pour l'utilisateur (filtré par couple / placement).
|
||||||
|
static Future<List<CarteBulle>> lister({String? placementId}) async {
|
||||||
|
final query = <String, String>{};
|
||||||
|
if (placementId != null && placementId.isNotEmpty) {
|
||||||
|
query['placementId'] = placementId;
|
||||||
|
}
|
||||||
|
final uri = Uri.parse(
|
||||||
|
'${ApiConfig.baseUrl}${ApiConfig.cards}',
|
||||||
|
).replace(queryParameters: query.isEmpty ? null : query);
|
||||||
|
|
||||||
|
final response = await http.get(uri, headers: await _headers());
|
||||||
|
if (response.statusCode != 200) {
|
||||||
|
throw Exception(
|
||||||
|
_extractError(response.body, 'Erreur chargement des cartes'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final decoded = jsonDecode(response.body);
|
||||||
|
final list = (decoded is Map ? decoded['items'] as List? : null) ?? const [];
|
||||||
|
return list
|
||||||
|
.whereType<Map>()
|
||||||
|
.map((e) => CarteBulle.fromJson(Map<String, dynamic>.from(e)))
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Répondre : accept | refuse | ack.
|
||||||
|
static Future<CarteBulle> repondre({
|
||||||
|
required String cardId,
|
||||||
|
required String action,
|
||||||
|
String? comment,
|
||||||
|
}) async {
|
||||||
|
final response = await http.post(
|
||||||
|
Uri.parse(
|
||||||
|
'${ApiConfig.baseUrl}${ApiConfig.cards}/$cardId/respond',
|
||||||
|
),
|
||||||
|
headers: await _headers(),
|
||||||
|
body: jsonEncode({
|
||||||
|
'action': action,
|
||||||
|
if (comment != null && comment.trim().isNotEmpty)
|
||||||
|
'comment': comment.trim(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.statusCode != 200) {
|
||||||
|
throw Exception(
|
||||||
|
_extractError(response.body, 'Erreur lors de la réponse'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final decoded = jsonDecode(response.body);
|
||||||
|
return CarteBulle.fromJson(Map<String, dynamic>.from(decoded as Map));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -383,6 +383,13 @@ class AuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Récupère l'utilisateur connecté depuis le cache
|
/// Récupère l'utilisateur connecté depuis le cache
|
||||||
|
static const String tokenKey = 'auth_token';
|
||||||
|
|
||||||
|
static Future<String?> getToken() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
return prefs.getString(tokenKey);
|
||||||
|
}
|
||||||
|
|
||||||
static Future<AppUser?> getCurrentUser() async {
|
static Future<AppUser?> getCurrentUser() async {
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
final userJson = prefs.getString(_currentUserKey);
|
final userJson = prefs.getString(_currentUserKey);
|
||||||
|
|||||||
@@ -73,4 +73,45 @@ class CoupleGardeService {
|
|||||||
Map<String, dynamic>.from(decoded as Map),
|
Map<String, dynamic>.from(decoded as Map),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Liste les couples de garde et le couple courant de l'AM connectée.
|
||||||
|
static Future<CouplesGardeResponse> getAmCouplesGarde() async {
|
||||||
|
final response = await http.get(
|
||||||
|
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.assistantesMaternellesCouplesGarde}'),
|
||||||
|
headers: await _headers(),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.statusCode != 200) {
|
||||||
|
throw Exception(
|
||||||
|
_extractError(response.body, 'Erreur chargement des couples de garde (AM)'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final decoded = jsonDecode(response.body);
|
||||||
|
return CouplesGardeResponse.fromJson(
|
||||||
|
Map<String, dynamic>.from(decoded as Map),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Persiste le couple courant (AM) et renvoie la liste à jour.
|
||||||
|
static Future<CouplesGardeResponse> definirAmCoupleCourant(
|
||||||
|
String coupleId,
|
||||||
|
) async {
|
||||||
|
final response = await http.put(
|
||||||
|
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.assistantesMaternellesCoupleGardeCourant}'),
|
||||||
|
headers: await _headers(),
|
||||||
|
body: jsonEncode({'couple_id': coupleId}),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.statusCode != 200) {
|
||||||
|
throw Exception(
|
||||||
|
_extractError(response.body, 'Erreur sélection du couple de garde (AM)'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final decoded = jsonDecode(response.body);
|
||||||
|
return CouplesGardeResponse.fromJson(
|
||||||
|
Map<String, dynamic>.from(decoded as Map),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ class RepriseMapper {
|
|||||||
CardColorVertical.red,
|
CardColorVertical.red,
|
||||||
CardColorVertical.green,
|
CardColorVertical.green,
|
||||||
CardColorVertical.blue,
|
CardColorVertical.blue,
|
||||||
|
CardColorVertical.aqua,
|
||||||
];
|
];
|
||||||
|
|
||||||
static ParentData parentFromDossier(ParentDossier p) {
|
static ParentData parentFromDossier(ParentDossier p) {
|
||||||
|
|||||||
@@ -185,6 +185,8 @@ class BaseFormScreen extends StatelessWidget {
|
|||||||
return CardColorVertical.pink.path;
|
return CardColorVertical.pink.path;
|
||||||
case CardColorHorizontal.red:
|
case CardColorHorizontal.red:
|
||||||
return CardColorVertical.red.path;
|
return CardColorVertical.red.path;
|
||||||
|
case CardColorHorizontal.aqua:
|
||||||
|
return CardColorVertical.aqua.path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -205,9 +205,14 @@ class _ChildCardWidgetState extends State<ChildCardWidget> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
final Color baseCardColorForShadow = widget.childData.cardColor == CardColorVertical.lavender
|
final Color baseCardColorForShadow =
|
||||||
? Colors.purple.shade200
|
widget.childData.cardColor == CardColorVertical.lavender
|
||||||
: (widget.childData.cardColor == CardColorVertical.pink ? Colors.pink.shade200 : Colors.grey.shade200);
|
? Colors.purple.shade200
|
||||||
|
: (widget.childData.cardColor == CardColorVertical.pink
|
||||||
|
? Colors.pink.shade200
|
||||||
|
: (widget.childData.cardColor == CardColorVertical.aqua
|
||||||
|
? Colors.teal.shade200
|
||||||
|
: Colors.grey.shade200));
|
||||||
final double photoSide = 200.0 * (config.isMobile ? 0.8 : 1.0);
|
final double photoSide = 200.0 * (config.isMobile ? 0.8 : 1.0);
|
||||||
final double editableCardWidth = config.isMobile
|
final double editableCardWidth = config.isMobile
|
||||||
? double.infinity
|
? double.infinity
|
||||||
@@ -340,6 +345,7 @@ class _ChildCardWidgetState extends State<ChildCardWidget> {
|
|||||||
|
|
||||||
// Mapping manuel simple
|
// Mapping manuel simple
|
||||||
if (widget.childData.cardColor.path.contains('lavender')) horizontalCardAsset = CardColorHorizontal.lavender.path;
|
if (widget.childData.cardColor.path.contains('lavender')) horizontalCardAsset = CardColorHorizontal.lavender.path;
|
||||||
|
else if (widget.childData.cardColor.path.contains('aqua')) horizontalCardAsset = CardColorHorizontal.aqua.path;
|
||||||
else if (widget.childData.cardColor.path.contains('blue')) horizontalCardAsset = CardColorHorizontal.blue.path;
|
else if (widget.childData.cardColor.path.contains('blue')) horizontalCardAsset = CardColorHorizontal.blue.path;
|
||||||
else if (widget.childData.cardColor.path.contains('green')) horizontalCardAsset = CardColorHorizontal.green.path;
|
else if (widget.childData.cardColor.path.contains('green')) horizontalCardAsset = CardColorHorizontal.green.path;
|
||||||
else if (widget.childData.cardColor.path.contains('lime')) horizontalCardAsset = CardColorHorizontal.lime.path;
|
else if (widget.childData.cardColor.path.contains('lime')) horizontalCardAsset = CardColorHorizontal.lime.path;
|
||||||
|
|||||||
@@ -1302,6 +1302,8 @@ class _PersonalInfoFormScreenState extends State<PersonalInfoFormScreen> {
|
|||||||
return CardColorVertical.pink.path;
|
return CardColorVertical.pink.path;
|
||||||
case CardColorHorizontal.red:
|
case CardColorHorizontal.red:
|
||||||
return CardColorVertical.red.path;
|
return CardColorVertical.red.path;
|
||||||
|
case CardColorHorizontal.aqua:
|
||||||
|
return CardColorVertical.aqua.path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -642,6 +642,8 @@ class _PresentationFormScreenState extends State<PresentationFormScreen> {
|
|||||||
return CardColorVertical.pink.path;
|
return CardColorVertical.pink.path;
|
||||||
case CardColorHorizontal.red:
|
case CardColorHorizontal.red:
|
||||||
return CardColorVertical.red.path;
|
return CardColorVertical.red.path;
|
||||||
|
case CardColorHorizontal.aqua:
|
||||||
|
return CardColorVertical.aqua.path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1196,6 +1196,8 @@ class _ProfessionalInfoFormScreenState extends State<ProfessionalInfoFormScreen>
|
|||||||
return CardColorVertical.pink.path;
|
return CardColorVertical.pink.path;
|
||||||
case CardColorHorizontal.red:
|
case CardColorHorizontal.red:
|
||||||
return CardColorVertical.red.path;
|
return CardColorVertical.red.path;
|
||||||
|
case CardColorHorizontal.aqua:
|
||||||
|
return CardColorVertical.aqua.path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,251 @@
|
|||||||
|
import 'dart:ui' as ui;
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
|
/// Mode d’extension du fond pastel.
|
||||||
|
enum CarteStretch {
|
||||||
|
/// 9 zones (bulles / cartes content).
|
||||||
|
both,
|
||||||
|
|
||||||
|
/// Uniquement horizontal — bouts en demi-cercle (bandeau couple).
|
||||||
|
horizontal,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Fond pastel extensible (capacité par défaut des « cartes » UI).
|
||||||
|
///
|
||||||
|
/// Coins / bouts à taille logique fixe ; le reste s’étire selon [stretch].
|
||||||
|
class Carte extends StatefulWidget {
|
||||||
|
final String assetPath;
|
||||||
|
final CarteStretch stretch;
|
||||||
|
final Rect centerSlice;
|
||||||
|
final double cornerWidth;
|
||||||
|
final double cornerHeight;
|
||||||
|
final Widget? child;
|
||||||
|
final EdgeInsetsGeometry? padding;
|
||||||
|
final BoxConstraints? constraints;
|
||||||
|
final double? width;
|
||||||
|
final double? height;
|
||||||
|
|
||||||
|
/// Carte / bulle content (`card_*_h.png`, ~1024×512).
|
||||||
|
const Carte({
|
||||||
|
super.key,
|
||||||
|
required this.assetPath,
|
||||||
|
this.child,
|
||||||
|
this.padding,
|
||||||
|
this.constraints,
|
||||||
|
this.width,
|
||||||
|
this.height,
|
||||||
|
this.stretch = CarteStretch.both,
|
||||||
|
this.centerSlice = const Rect.fromLTRB(160, 90, 864, 422),
|
||||||
|
this.cornerWidth = 56,
|
||||||
|
this.cornerHeight = 40,
|
||||||
|
});
|
||||||
|
|
||||||
|
/// Bandeau couple enfant / nounou (`bandeau_*.png`, ~1024×160).
|
||||||
|
/// Étirement horizontal seul pour garder les bouts ronds.
|
||||||
|
const Carte.bandeau({
|
||||||
|
super.key,
|
||||||
|
required this.assetPath,
|
||||||
|
this.child,
|
||||||
|
this.padding,
|
||||||
|
this.constraints,
|
||||||
|
this.width,
|
||||||
|
this.height,
|
||||||
|
}) : stretch = CarteStretch.horizontal,
|
||||||
|
// Demi-cercle source ≈ moitié de la hauteur (160/2 = 80).
|
||||||
|
centerSlice = const Rect.fromLTRB(80, 0, 944, 160),
|
||||||
|
cornerWidth = 45,
|
||||||
|
cornerHeight = 45;
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<Carte> createState() => _CarteState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CarteImageCache {
|
||||||
|
static final Map<String, Future<ui.Image>> _futures = {};
|
||||||
|
|
||||||
|
static Future<ui.Image> load(String path) {
|
||||||
|
return _futures.putIfAbsent(path, () async {
|
||||||
|
final data = await rootBundle.load(path);
|
||||||
|
final codec = await ui.instantiateImageCodec(
|
||||||
|
data.buffer.asUint8List(),
|
||||||
|
);
|
||||||
|
final frame = await codec.getNextFrame();
|
||||||
|
return frame.image;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CarteState extends State<Carte> {
|
||||||
|
ui.Image? _image;
|
||||||
|
String? _loadedPath;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_load();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(covariant Carte oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.assetPath != widget.assetPath) {
|
||||||
|
_load();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _load() async {
|
||||||
|
final path = widget.assetPath;
|
||||||
|
final image = await _CarteImageCache.load(path);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_image = image;
|
||||||
|
_loadedPath = path;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final img = _image;
|
||||||
|
final ready = img != null && _loadedPath == widget.assetPath;
|
||||||
|
|
||||||
|
return SizedBox(
|
||||||
|
width: widget.width,
|
||||||
|
height: widget.height,
|
||||||
|
child: Container(
|
||||||
|
constraints: widget.constraints,
|
||||||
|
child: CustomPaint(
|
||||||
|
painter: ready
|
||||||
|
? _CartePainter(
|
||||||
|
image: img!,
|
||||||
|
stretch: widget.stretch,
|
||||||
|
centerSlice: widget.centerSlice,
|
||||||
|
cornerWidth: widget.cornerWidth,
|
||||||
|
cornerHeight: widget.cornerHeight,
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
child: Padding(
|
||||||
|
padding: widget.padding ?? EdgeInsets.zero,
|
||||||
|
child: widget.child,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CartePainter extends CustomPainter {
|
||||||
|
final ui.Image image;
|
||||||
|
final CarteStretch stretch;
|
||||||
|
final Rect centerSlice;
|
||||||
|
final double cornerWidth;
|
||||||
|
final double cornerHeight;
|
||||||
|
|
||||||
|
_CartePainter({
|
||||||
|
required this.image,
|
||||||
|
required this.stretch,
|
||||||
|
required this.centerSlice,
|
||||||
|
required this.cornerWidth,
|
||||||
|
required this.cornerHeight,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
void paint(Canvas canvas, Size size) {
|
||||||
|
if (size.width <= 0 || size.height <= 0) return;
|
||||||
|
|
||||||
|
final paint = Paint()..filterQuality = FilterQuality.high;
|
||||||
|
final srcW = image.width.toDouble();
|
||||||
|
final srcH = image.height.toDouble();
|
||||||
|
|
||||||
|
void draw(Rect src, Rect dst) {
|
||||||
|
if (src.width <= 0 || src.height <= 0) return;
|
||||||
|
if (dst.width <= 0 || dst.height <= 0) return;
|
||||||
|
canvas.drawImageRect(image, src, dst, paint);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stretch == CarteStretch.horizontal) {
|
||||||
|
// 3 bandes pleine hauteur : bout | milieu | bout (pilule).
|
||||||
|
// Largeur du bout = moitié de la hauteur → demi-cercle propre.
|
||||||
|
final tip = (size.height / 2).clamp(1.0, size.width / 2);
|
||||||
|
final srcTip = centerSlice.left.clamp(1.0, srcW / 2);
|
||||||
|
final midW = (size.width - tip * 2).clamp(0.0, size.width);
|
||||||
|
|
||||||
|
draw(
|
||||||
|
Rect.fromLTWH(0, 0, srcTip, srcH),
|
||||||
|
Rect.fromLTWH(0, 0, tip, size.height),
|
||||||
|
);
|
||||||
|
draw(
|
||||||
|
Rect.fromLTWH(srcTip, 0, (srcW - srcTip * 2).clamp(1.0, srcW), srcH),
|
||||||
|
Rect.fromLTWH(tip, 0, midW, size.height),
|
||||||
|
);
|
||||||
|
draw(
|
||||||
|
Rect.fromLTWH(srcW - srcTip, 0, srcTip, srcH),
|
||||||
|
Rect.fromLTWH(tip + midW, 0, tip, size.height),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 9 zones (bulles).
|
||||||
|
final srcLeft = centerSlice.left.clamp(0.0, srcW);
|
||||||
|
final srcTop = centerSlice.top.clamp(0.0, srcH);
|
||||||
|
final srcRight = centerSlice.right.clamp(0.0, srcW);
|
||||||
|
final srcBottom = centerSlice.bottom.clamp(0.0, srcH);
|
||||||
|
|
||||||
|
final srcLeftW = srcLeft;
|
||||||
|
final srcTopH = srcTop;
|
||||||
|
final srcRightW = srcW - srcRight;
|
||||||
|
final srcBottomH = srcH - srcBottom;
|
||||||
|
final srcCenterW = (srcRight - srcLeft).clamp(1.0, srcW);
|
||||||
|
final srcCenterH = (srcBottom - srcTop).clamp(1.0, srcH);
|
||||||
|
|
||||||
|
final dstLeftW = cornerWidth.clamp(1.0, size.width / 2);
|
||||||
|
final dstRightW = cornerWidth.clamp(1.0, size.width / 2);
|
||||||
|
final dstTopH = cornerHeight.clamp(1.0, size.height / 2);
|
||||||
|
final dstBottomH = cornerHeight.clamp(1.0, size.height / 2);
|
||||||
|
final dstCenterW =
|
||||||
|
(size.width - dstLeftW - dstRightW).clamp(0.0, size.width);
|
||||||
|
final dstCenterH =
|
||||||
|
(size.height - dstTopH - dstBottomH).clamp(0.0, size.height);
|
||||||
|
|
||||||
|
// Haut
|
||||||
|
draw(Rect.fromLTWH(0, 0, srcLeftW, srcTopH),
|
||||||
|
Rect.fromLTWH(0, 0, dstLeftW, dstTopH));
|
||||||
|
draw(Rect.fromLTWH(srcLeft, 0, srcCenterW, srcTopH),
|
||||||
|
Rect.fromLTWH(dstLeftW, 0, dstCenterW, dstTopH));
|
||||||
|
draw(Rect.fromLTWH(srcRight, 0, srcRightW, srcTopH),
|
||||||
|
Rect.fromLTWH(dstLeftW + dstCenterW, 0, dstRightW, dstTopH));
|
||||||
|
|
||||||
|
// Milieu
|
||||||
|
draw(Rect.fromLTWH(0, srcTop, srcLeftW, srcCenterH),
|
||||||
|
Rect.fromLTWH(0, dstTopH, dstLeftW, dstCenterH));
|
||||||
|
draw(Rect.fromLTWH(srcLeft, srcTop, srcCenterW, srcCenterH),
|
||||||
|
Rect.fromLTWH(dstLeftW, dstTopH, dstCenterW, dstCenterH));
|
||||||
|
draw(Rect.fromLTWH(srcRight, srcTop, srcRightW, srcCenterH),
|
||||||
|
Rect.fromLTWH(dstLeftW + dstCenterW, dstTopH, dstRightW, dstCenterH));
|
||||||
|
|
||||||
|
// Bas
|
||||||
|
draw(Rect.fromLTWH(0, srcBottom, srcLeftW, srcBottomH),
|
||||||
|
Rect.fromLTWH(0, dstTopH + dstCenterH, dstLeftW, dstBottomH));
|
||||||
|
draw(Rect.fromLTWH(srcLeft, srcBottom, srcCenterW, srcBottomH),
|
||||||
|
Rect.fromLTWH(dstLeftW, dstTopH + dstCenterH, dstCenterW, dstBottomH));
|
||||||
|
draw(
|
||||||
|
Rect.fromLTWH(srcRight, srcBottom, srcRightW, srcBottomH),
|
||||||
|
Rect.fromLTWH(
|
||||||
|
dstLeftW + dstCenterW,
|
||||||
|
dstTopH + dstCenterH,
|
||||||
|
dstRightW,
|
||||||
|
dstBottomH,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool shouldRepaint(covariant _CartePainter oldDelegate) {
|
||||||
|
return oldDelegate.image != image ||
|
||||||
|
oldDelegate.stretch != stretch ||
|
||||||
|
oldDelegate.centerSlice != centerSlice ||
|
||||||
|
oldDelegate.cornerWidth != cornerWidth ||
|
||||||
|
oldDelegate.cornerHeight != cornerHeight;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,881 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:google_fonts/google_fonts.dart';
|
||||||
|
import 'package:p_tits_pas/models/carte_bulle.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/cards_service.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/carte.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
|
|
||||||
|
/// Feed de bulles (file d'attention) — ticket #173.
|
||||||
|
/// Widget partagé parent / AM ; les actions dépendent du rôle + payload API.
|
||||||
|
class CartesFeed extends StatefulWidget {
|
||||||
|
final String? placementId;
|
||||||
|
final VoidCallback? onAjouterBulle;
|
||||||
|
|
||||||
|
const CartesFeed({
|
||||||
|
super.key,
|
||||||
|
this.placementId,
|
||||||
|
this.onAjouterBulle,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<CartesFeed> createState() => _CartesFeedState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CartesFeedState extends State<CartesFeed> {
|
||||||
|
static const double _fadeExtent = 0.08;
|
||||||
|
|
||||||
|
List<CarteBulle> _items = const [];
|
||||||
|
bool _loading = true;
|
||||||
|
String? _error;
|
||||||
|
String? _busyCardId;
|
||||||
|
|
||||||
|
final ScrollController _scrollController = ScrollController();
|
||||||
|
bool _isScrollable = false;
|
||||||
|
bool _fadeTop = false;
|
||||||
|
bool _fadeBottom = false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_scrollController.addListener(_syncScrollFades);
|
||||||
|
_load();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_scrollController.removeListener(_syncScrollFades);
|
||||||
|
_scrollController.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(covariant CartesFeed oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.placementId != widget.placementId) {
|
||||||
|
_load();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _syncScrollFades() {
|
||||||
|
if (!_scrollController.hasClients) return;
|
||||||
|
final position = _scrollController.position;
|
||||||
|
final scrollable = position.maxScrollExtent > 0.0;
|
||||||
|
final threshold = position.viewportDimension * _fadeExtent / 2;
|
||||||
|
final fadeTop = scrollable && position.pixels > threshold;
|
||||||
|
final fadeBottom = scrollable &&
|
||||||
|
position.pixels < (position.maxScrollExtent - threshold);
|
||||||
|
if (scrollable != _isScrollable ||
|
||||||
|
fadeTop != _fadeTop ||
|
||||||
|
fadeBottom != _fadeBottom) {
|
||||||
|
setState(() {
|
||||||
|
_isScrollable = scrollable;
|
||||||
|
_fadeTop = fadeTop;
|
||||||
|
_fadeBottom = fadeBottom;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _load() async {
|
||||||
|
setState(() {
|
||||||
|
_loading = true;
|
||||||
|
_error = null;
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
final items = await CardsService.lister(
|
||||||
|
placementId: widget.placementId,
|
||||||
|
);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_items = items;
|
||||||
|
_loading = false;
|
||||||
|
});
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) => _syncScrollFades());
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_error = e.toString().replaceFirst('Exception: ', '');
|
||||||
|
_loading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _respond(
|
||||||
|
CarteBulle card, {
|
||||||
|
required String action,
|
||||||
|
String? comment,
|
||||||
|
}) async {
|
||||||
|
setState(() => _busyCardId = card.id);
|
||||||
|
try {
|
||||||
|
final updated = await CardsService.repondre(
|
||||||
|
cardId: card.id,
|
||||||
|
action: action,
|
||||||
|
comment: comment,
|
||||||
|
);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_items = [
|
||||||
|
for (final c in _items) if (c.id == updated.id) updated else c,
|
||||||
|
];
|
||||||
|
_busyCardId = null;
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() => _busyCardId = null);
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(e.toString().replaceFirst('Exception: ', '')),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onAccept(CarteBulle card) async {
|
||||||
|
final ok = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (ctx) => AlertDialog(
|
||||||
|
title: Text(
|
||||||
|
'Accepter la demande ?',
|
||||||
|
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
|
||||||
|
),
|
||||||
|
content: Text(
|
||||||
|
'Confirmez-vous l’acceptation de « ${card.titreAffiche} » '
|
||||||
|
'(${_periodeCourte(card)}) ?',
|
||||||
|
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(ctx, false),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
FilledButton(
|
||||||
|
onPressed: () => Navigator.pop(ctx, true),
|
||||||
|
child: const Text('Confirmer'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (ok == true) {
|
||||||
|
await _respond(card, action: 'accept');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onAck(CarteBulle card) async {
|
||||||
|
final ok = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (ctx) => AlertDialog(
|
||||||
|
title: Text(
|
||||||
|
'Prise en compte',
|
||||||
|
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
|
||||||
|
),
|
||||||
|
content: Text(
|
||||||
|
'Confirmez-vous avoir bien reçu cet arrêt maladie '
|
||||||
|
'(${_periodeCourte(card)}) ?',
|
||||||
|
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(ctx, false),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
FilledButton(
|
||||||
|
onPressed: () => Navigator.pop(ctx, true),
|
||||||
|
child: const Text('Bien reçu'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (ok == true) {
|
||||||
|
await _respond(card, action: 'ack');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onRefuse(CarteBulle card) async {
|
||||||
|
final controller = TextEditingController();
|
||||||
|
final ok = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (ctx) => AlertDialog(
|
||||||
|
title: Text(
|
||||||
|
'Refuser la demande',
|
||||||
|
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
|
||||||
|
),
|
||||||
|
content: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'Indiquez le motif du refus pour « ${card.titreAffiche} ».',
|
||||||
|
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
TextField(
|
||||||
|
controller: controller,
|
||||||
|
maxLines: 3,
|
||||||
|
autofocus: true,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
hintText: 'Motif du refus…',
|
||||||
|
border: OutlineInputBorder(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(ctx, false),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
FilledButton(
|
||||||
|
onPressed: () {
|
||||||
|
if (controller.text.trim().isEmpty) return;
|
||||||
|
Navigator.pop(ctx, true);
|
||||||
|
},
|
||||||
|
child: const Text('Refuser'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (ok == true && controller.text.trim().isNotEmpty) {
|
||||||
|
await _respond(
|
||||||
|
card,
|
||||||
|
action: 'refuse',
|
||||||
|
comment: controller.text.trim(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
controller.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
static String _periodeCourte(CarteBulle card) {
|
||||||
|
final d = card.dateDebut;
|
||||||
|
final f = card.dateFin;
|
||||||
|
String fmt(String? iso) {
|
||||||
|
if (iso == null || iso.isEmpty) return '…';
|
||||||
|
final dt = DateTime.tryParse(iso);
|
||||||
|
if (dt == null) return iso;
|
||||||
|
return '${dt.day.toString().padLeft(2, '0')}/'
|
||||||
|
'${dt.month.toString().padLeft(2, '0')}/${dt.year}';
|
||||||
|
}
|
||||||
|
if (d == null && f == null) return 'période non précisée';
|
||||||
|
if (d != null && f != null && d == f) return fmt(d);
|
||||||
|
return '${fmt(d)} → ${fmt(f)}';
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
const Icon(
|
||||||
|
Icons.style_outlined,
|
||||||
|
color: QuotidienTheme.lavender,
|
||||||
|
size: 22,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'Cartes',
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
TextButton.icon(
|
||||||
|
onPressed: widget.onAjouterBulle,
|
||||||
|
icon: const Icon(Icons.add, size: 18),
|
||||||
|
label: Text(
|
||||||
|
'Ajouter',
|
||||||
|
style: GoogleFonts.merriweather(fontSize: 13),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Expanded(child: _buildBody()),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildBody() {
|
||||||
|
if (_loading) {
|
||||||
|
return const Center(
|
||||||
|
child: SizedBox(
|
||||||
|
width: 28,
|
||||||
|
height: 28,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (_error != null) {
|
||||||
|
return Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
_error!,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: GoogleFonts.merriweather(
|
||||||
|
fontSize: 13,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
TextButton(onPressed: _load, child: const Text('Réessayer')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (_items.isEmpty) {
|
||||||
|
return Center(
|
||||||
|
child: Text(
|
||||||
|
'Aucune bulle pour le moment.\nLa file d’attention est vide — c’est normal.',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: GoogleFonts.merriweather(
|
||||||
|
fontSize: 13,
|
||||||
|
color: QuotidienTheme.muted,
|
||||||
|
height: 1.4,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return NotificationListener<ScrollMetricsNotification>(
|
||||||
|
onNotification: (_) {
|
||||||
|
_syncScrollFades();
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
child: ShaderMask(
|
||||||
|
blendMode: BlendMode.dstIn,
|
||||||
|
shaderCallback: (Rect bounds) {
|
||||||
|
final stops = <double>[
|
||||||
|
0.0,
|
||||||
|
_fadeExtent,
|
||||||
|
1.0 - _fadeExtent,
|
||||||
|
1.0,
|
||||||
|
];
|
||||||
|
if (!_isScrollable) {
|
||||||
|
return const LinearGradient(
|
||||||
|
begin: Alignment.topCenter,
|
||||||
|
end: Alignment.bottomCenter,
|
||||||
|
colors: <Color>[
|
||||||
|
Colors.black,
|
||||||
|
Colors.black,
|
||||||
|
Colors.black,
|
||||||
|
Colors.black,
|
||||||
|
],
|
||||||
|
stops: [0.0, 0.08, 0.92, 1.0],
|
||||||
|
).createShader(bounds);
|
||||||
|
}
|
||||||
|
final topMask = _fadeTop ? Colors.transparent : Colors.black;
|
||||||
|
final bottomMask = _fadeBottom ? Colors.transparent : Colors.black;
|
||||||
|
return LinearGradient(
|
||||||
|
begin: Alignment.topCenter,
|
||||||
|
end: Alignment.bottomCenter,
|
||||||
|
colors: <Color>[
|
||||||
|
topMask,
|
||||||
|
Colors.black,
|
||||||
|
Colors.black,
|
||||||
|
bottomMask,
|
||||||
|
],
|
||||||
|
stops: stops,
|
||||||
|
).createShader(bounds);
|
||||||
|
},
|
||||||
|
child: RefreshIndicator(
|
||||||
|
onRefresh: _load,
|
||||||
|
child: ListView.separated(
|
||||||
|
controller: _scrollController,
|
||||||
|
padding: const EdgeInsets.only(top: 4, bottom: 8),
|
||||||
|
itemCount: _items.length,
|
||||||
|
separatorBuilder: (_, __) => const SizedBox(height: 10),
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final card = _items[index];
|
||||||
|
return _BulleTile(
|
||||||
|
card: card,
|
||||||
|
busy: _busyCardId == card.id,
|
||||||
|
onAccept: () => _onAccept(card),
|
||||||
|
onAck: () => _onAck(card),
|
||||||
|
onRefuse: () => _onRefuse(card),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _BulleTile extends StatelessWidget {
|
||||||
|
/// Encre aqua foncé — harmonisée fond aqua / valise (pas le violet).
|
||||||
|
static const Color _aquaInk = Color(0xFF315F63);
|
||||||
|
/// Date : même famille, ~12 % plus claire.
|
||||||
|
static const Color _aquaDate = Color(0xFF4A7276);
|
||||||
|
/// Lien agenda : légère dérive bleue.
|
||||||
|
static const Color _aquaLink = Color(0xFF2B5868);
|
||||||
|
|
||||||
|
final CarteBulle card;
|
||||||
|
final bool busy;
|
||||||
|
final VoidCallback onAccept;
|
||||||
|
final VoidCallback onAck;
|
||||||
|
final VoidCallback onRefuse;
|
||||||
|
|
||||||
|
const _BulleTile({
|
||||||
|
required this.card,
|
||||||
|
required this.busy,
|
||||||
|
required this.onAccept,
|
||||||
|
required this.onAck,
|
||||||
|
required this.onRefuse,
|
||||||
|
});
|
||||||
|
|
||||||
|
static const _mois = [
|
||||||
|
'janvier',
|
||||||
|
'février',
|
||||||
|
'mars',
|
||||||
|
'avril',
|
||||||
|
'mai',
|
||||||
|
'juin',
|
||||||
|
'juillet',
|
||||||
|
'août',
|
||||||
|
'septembre',
|
||||||
|
'octobre',
|
||||||
|
'novembre',
|
||||||
|
'décembre',
|
||||||
|
];
|
||||||
|
|
||||||
|
String _fmtLong(String? iso) {
|
||||||
|
if (iso == null || iso.isEmpty) return '…';
|
||||||
|
final dt = DateTime.tryParse(iso);
|
||||||
|
if (dt == null) return iso;
|
||||||
|
final jj = dt.day.toString().padLeft(2, '0');
|
||||||
|
return '$jj ${_mois[dt.month - 1]} ${dt.year}';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Une ligne type maquette : « Du 04 au 06 novembre 2026 ».
|
||||||
|
String _fmtPeriodeUneLigne() {
|
||||||
|
final d1 = DateTime.tryParse(card.dateDebut ?? '');
|
||||||
|
final d2 = DateTime.tryParse(card.dateFin ?? '');
|
||||||
|
if (d1 == null && d2 == null) return '';
|
||||||
|
if (d1 != null && d2 == null) return 'Le ${_fmtLong(card.dateDebut)}';
|
||||||
|
if (d1 == null && d2 != null) return 'Au ${_fmtLong(card.dateFin)}';
|
||||||
|
final a = d1!;
|
||||||
|
final b = d2!;
|
||||||
|
final j1 = a.day.toString().padLeft(2, '0');
|
||||||
|
final j2 = b.day.toString().padLeft(2, '0');
|
||||||
|
if (a.year == b.year && a.month == b.month && a.day == b.day) {
|
||||||
|
return 'Le $j1 ${_mois[a.month - 1]} ${a.year}';
|
||||||
|
}
|
||||||
|
if (a.year == b.year && a.month == b.month) {
|
||||||
|
return 'Du $j1 au $j2 ${_mois[a.month - 1]} ${a.year}';
|
||||||
|
}
|
||||||
|
if (a.year == b.year) {
|
||||||
|
return 'Du $j1 ${_mois[a.month - 1]} au $j2 ${_mois[b.month - 1]} ${a.year}';
|
||||||
|
}
|
||||||
|
return 'Du $j1 ${_mois[a.month - 1]} ${a.year} '
|
||||||
|
'au $j2 ${_mois[b.month - 1]} ${b.year}';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Arrêt maladie : reste opaque tant que la période n’est pas finie.
|
||||||
|
bool get _attenuee {
|
||||||
|
if (card.isArretMaladie && card.periodeEncoreActive) return false;
|
||||||
|
return card.statut == CarteStatut.traitee;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
if (card.isCongeAm) return _buildConge(context);
|
||||||
|
return _buildGeneric(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildConge(BuildContext context) {
|
||||||
|
final periode = _fmtPeriodeUneLigne();
|
||||||
|
|
||||||
|
return Opacity(
|
||||||
|
opacity: _attenuee ? 0.55 : 1,
|
||||||
|
child: Carte(
|
||||||
|
assetPath: card.backgroundAsset,
|
||||||
|
constraints: const BoxConstraints(minHeight: 140),
|
||||||
|
padding: const EdgeInsets.fromLTRB(22, 18, 18, 14),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
card.titreAffiche,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: FontWeight.w700,
|
||||||
|
color: _aquaInk,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (periode.isNotEmpty) ...[
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Image.asset(
|
||||||
|
'assets/images/cartes/icon_calendrier_crayon.png',
|
||||||
|
width: 28,
|
||||||
|
height: 28,
|
||||||
|
fit: BoxFit.contain,
|
||||||
|
filterQuality: FilterQuality.high,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
periode,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 15,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: _aquaDate,
|
||||||
|
height: 1.25,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
if (card.statut == CarteStatut.refusee) ...[
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
card.lastRefuseComment != null &&
|
||||||
|
card.lastRefuseComment!.trim().isNotEmpty
|
||||||
|
? 'Refusé — ${card.lastRefuseComment}'
|
||||||
|
: 'Refusé',
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: GoogleFonts.merriweather(
|
||||||
|
fontSize: 12,
|
||||||
|
fontStyle: FontStyle.italic,
|
||||||
|
color: _aquaInk,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
] else if (card.statut == CarteStatut.ouverte &&
|
||||||
|
card.isCreator) ...[
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
'En attente de réponse',
|
||||||
|
style: GoogleFonts.merriweather(
|
||||||
|
fontSize: 12,
|
||||||
|
color: QuotidienTheme.muted,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (card.iconAsset != null) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Image.asset(
|
||||||
|
card.iconAsset!,
|
||||||
|
width: 72,
|
||||||
|
height: 72,
|
||||||
|
fit: BoxFit.contain,
|
||||||
|
filterQuality: FilterQuality.high,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
if (card.peutRepondre)
|
||||||
|
busy
|
||||||
|
? const SizedBox(
|
||||||
|
width: 28,
|
||||||
|
height: 28,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
|
)
|
||||||
|
: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
_PilulePeinteButton(
|
||||||
|
asset:
|
||||||
|
'assets/images/cartes/btn_coche_pilule.png',
|
||||||
|
tooltip: 'Accepter',
|
||||||
|
onTap: onAccept,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
_PilulePeinteButton(
|
||||||
|
asset:
|
||||||
|
'assets/images/cartes/btn_croix_pilule.png',
|
||||||
|
tooltip: 'Refuser',
|
||||||
|
onTap: onRefuse,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
InkWell(
|
||||||
|
onTap: () {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
const SnackBar(
|
||||||
|
content: Text('Agenda — à venir.'),
|
||||||
|
duration: Duration(seconds: 2),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 4,
|
||||||
|
vertical: 4,
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
'Ouvrir dans l’agenda ↗',
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: _aquaLink,
|
||||||
|
decoration: TextDecoration.underline,
|
||||||
|
decorationColor: _aquaLink,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildGeneric(BuildContext context) {
|
||||||
|
final memeJour = card.dateDebut != null &&
|
||||||
|
card.dateFin != null &&
|
||||||
|
card.dateDebut == card.dateFin;
|
||||||
|
|
||||||
|
return Opacity(
|
||||||
|
opacity: _attenuee ? 0.55 : 1,
|
||||||
|
child: Carte(
|
||||||
|
assetPath: card.backgroundAsset,
|
||||||
|
constraints: const BoxConstraints(minHeight: 120),
|
||||||
|
padding: const EdgeInsets.fromLTRB(22, 16, 22, 16),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
card.titreAffiche,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: FontWeight.w700,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (card.dateDebut != null || card.dateFin != null) ...[
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(left: 12),
|
||||||
|
child: memeJour
|
||||||
|
? Text(
|
||||||
|
'Le ${_fmtLong(card.dateDebut)}',
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 17,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
height: 1.35,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'Du ${_fmtLong(card.dateDebut)}',
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 17,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
height: 1.35,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
'Au ${_fmtLong(card.dateFin)}',
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 17,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
height: 1.35,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (card.iconAsset != null) ...[
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Image.asset(
|
||||||
|
card.iconAsset!,
|
||||||
|
width: 80,
|
||||||
|
height: 80,
|
||||||
|
fit: BoxFit.contain,
|
||||||
|
filterQuality: FilterQuality.high,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (card.statut == CarteStatut.refusee) ...[
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Text(
|
||||||
|
card.lastRefuseComment != null &&
|
||||||
|
card.lastRefuseComment!.trim().isNotEmpty
|
||||||
|
? 'Refusé — ${card.lastRefuseComment}'
|
||||||
|
: 'Refusé',
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: GoogleFonts.merriweather(
|
||||||
|
fontSize: 12,
|
||||||
|
fontStyle: FontStyle.italic,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
] else if (card.statut == CarteStatut.ouverte &&
|
||||||
|
card.isCreator) ...[
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Text(
|
||||||
|
'En attente de réponse',
|
||||||
|
style: GoogleFonts.merriweather(
|
||||||
|
fontSize: 12,
|
||||||
|
color: QuotidienTheme.muted,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
if (card.peutRepondre) ...[
|
||||||
|
const SizedBox(height: 14),
|
||||||
|
if (busy)
|
||||||
|
const Center(
|
||||||
|
child: SizedBox(
|
||||||
|
width: 22,
|
||||||
|
height: 22,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
else if (card.responseMode == CarteResponseMode.acceptRefuse)
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: _ActionPill(
|
||||||
|
asset: QuotidienTheme.pillTurquoiseAsset,
|
||||||
|
iconAsset: 'assets/images/coche.png',
|
||||||
|
tooltip: 'Accepter',
|
||||||
|
onTap: onAccept,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: _ActionPill(
|
||||||
|
asset: QuotidienTheme.pillCorailAsset,
|
||||||
|
iconAsset: 'assets/images/red_cross2.png',
|
||||||
|
tooltip: 'Refuser',
|
||||||
|
onTap: onRefuse,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
else if (card.responseMode == CarteResponseMode.ack)
|
||||||
|
_ActionPill(
|
||||||
|
asset: QuotidienTheme.pillTurquoiseAsset,
|
||||||
|
iconAsset: 'assets/images/coche.png',
|
||||||
|
tooltip: 'Bien reçu',
|
||||||
|
onTap: onAck,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Bouton pilule peinte (coche / croix intégrées) — carte congés.
|
||||||
|
class _PilulePeinteButton extends StatelessWidget {
|
||||||
|
final String asset;
|
||||||
|
final String tooltip;
|
||||||
|
final VoidCallback onTap;
|
||||||
|
|
||||||
|
const _PilulePeinteButton({
|
||||||
|
required this.asset,
|
||||||
|
required this.tooltip,
|
||||||
|
required this.onTap,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Tooltip(
|
||||||
|
message: tooltip,
|
||||||
|
child: InkWell(
|
||||||
|
onTap: onTap,
|
||||||
|
borderRadius: BorderRadius.circular(20),
|
||||||
|
child: Image.asset(
|
||||||
|
asset,
|
||||||
|
height: 36,
|
||||||
|
fit: BoxFit.contain,
|
||||||
|
filterQuality: FilterQuality.high,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Bouton pilule dessiné (fond pastel + coche / croix).
|
||||||
|
class _ActionPill extends StatelessWidget {
|
||||||
|
final String asset;
|
||||||
|
final String iconAsset;
|
||||||
|
final String tooltip;
|
||||||
|
final VoidCallback onTap;
|
||||||
|
|
||||||
|
const _ActionPill({
|
||||||
|
required this.asset,
|
||||||
|
required this.iconAsset,
|
||||||
|
required this.tooltip,
|
||||||
|
required this.onTap,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Tooltip(
|
||||||
|
message: tooltip,
|
||||||
|
child: InkWell(
|
||||||
|
onTap: onTap,
|
||||||
|
borderRadius: BorderRadius.circular(24),
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: Stack(
|
||||||
|
alignment: Alignment.center,
|
||||||
|
children: [
|
||||||
|
Positioned.fill(
|
||||||
|
child: Image.asset(asset, fit: BoxFit.fill),
|
||||||
|
),
|
||||||
|
Image.asset(
|
||||||
|
iconAsset,
|
||||||
|
height: 22,
|
||||||
|
width: 22,
|
||||||
|
fit: BoxFit.contain,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import 'package:google_fonts/google_fonts.dart';
|
|||||||
import 'package:p_tits_pas/models/couple_garde.dart';
|
import 'package:p_tits_pas/models/couple_garde.dart';
|
||||||
import 'package:p_tits_pas/services/api/api_config.dart';
|
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||||
import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
|
import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/carte.dart';
|
||||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
|
|
||||||
/// Rôle qui consulte le bandeau : côté parent (enfant | nounou) ou côté AM
|
/// Rôle qui consulte le bandeau : côté parent (enfant | nounou) ou côté AM
|
||||||
@@ -37,7 +38,7 @@ class CoupleSelectorBandeau extends StatelessWidget {
|
|||||||
|
|
||||||
CoupleGarde? get _selected {
|
CoupleGarde? get _selected {
|
||||||
if (couples.isEmpty) return null;
|
if (couples.isEmpty) return null;
|
||||||
if (selectedCoupleId != null) {
|
if (selectedCoupleId != null) {
|
||||||
for (final c in couples) {
|
for (final c in couples) {
|
||||||
if (c.id == selectedCoupleId) return c;
|
if (c.id == selectedCoupleId) return c;
|
||||||
}
|
}
|
||||||
@@ -133,16 +134,51 @@ class _CoupleCard extends StatelessWidget {
|
|||||||
required this.colorIndex,
|
required this.colorIndex,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/// Libellé parents côté AM : « Sophie » ou « Thomas et Claire ».
|
||||||
|
static String _parentsLabel(List<CoupleMembre> parents) {
|
||||||
|
if (parents.isEmpty) return 'Parents';
|
||||||
|
String prenomOf(CoupleMembre p) {
|
||||||
|
final prenom = (p.prenom ?? '').trim();
|
||||||
|
if (prenom.isNotEmpty) return prenom;
|
||||||
|
return p.displayName(fallback: 'Parent');
|
||||||
|
}
|
||||||
|
if (parents.length == 1) return prenomOf(parents.first);
|
||||||
|
return '${prenomOf(parents[0])} et ${prenomOf(parents[1])}';
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
// Parent mode: enfant | AM (photo + prénom)
|
||||||
height: 90,
|
// AM mode: enfant | parent(s) — texte seul, pas de vignette parent
|
||||||
decoration: BoxDecoration(
|
final isParentMode = mode == CoupleBandeauMode.parent;
|
||||||
image: DecorationImage(
|
|
||||||
image: AssetImage(QuotidienTheme.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length]),
|
Widget amOrParentsWidget;
|
||||||
fit: BoxFit.fill,
|
|
||||||
|
if (isParentMode) {
|
||||||
|
amOrParentsWidget = _MembreTile(
|
||||||
|
photoUrl: couple.am?.photoUrl,
|
||||||
|
name: (couple.am?.prenom != null && couple.am!.prenom!.isNotEmpty)
|
||||||
|
? couple.am!.prenom!
|
||||||
|
: (couple.am?.displayName(fallback: 'Nounou') ?? 'Nounou'),
|
||||||
|
fallbackIcon: Icons.volunteer_activism,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
amOrParentsWidget = Text(
|
||||||
|
_parentsLabel(couple.parents),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: GoogleFonts.merienda(
|
||||||
|
fontSize: 22,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
),
|
),
|
||||||
),
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Carte.bandeau(
|
||||||
|
assetPath: QuotidienTheme
|
||||||
|
.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length],
|
||||||
|
height: 90,
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
@@ -151,7 +187,8 @@ class _CoupleCard extends StatelessWidget {
|
|||||||
padding: const EdgeInsets.only(right: 12),
|
padding: const EdgeInsets.only(right: 12),
|
||||||
child: _MembreTile(
|
child: _MembreTile(
|
||||||
photoUrl: couple.enfant.photoUrl,
|
photoUrl: couple.enfant.photoUrl,
|
||||||
name: (couple.enfant.prenom != null && couple.enfant.prenom!.isNotEmpty)
|
name: (couple.enfant.prenom != null &&
|
||||||
|
couple.enfant.prenom!.isNotEmpty)
|
||||||
? couple.enfant.prenom!
|
? couple.enfant.prenom!
|
||||||
: couple.enfant.displayName(fallback: 'Enfant'),
|
: couple.enfant.displayName(fallback: 'Enfant'),
|
||||||
fallbackIcon: Icons.child_care,
|
fallbackIcon: Icons.child_care,
|
||||||
@@ -171,29 +208,17 @@ class _CoupleCard extends StatelessWidget {
|
|||||||
Expanded(
|
Expanded(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.only(left: 12),
|
padding: const EdgeInsets.only(left: 12),
|
||||||
child: _MembreTile(
|
child: amOrParentsWidget,
|
||||||
photoUrl: couple.am.photoUrl,
|
|
||||||
name: (couple.am.prenom != null && couple.am.prenom!.isNotEmpty)
|
|
||||||
? couple.am.prenom!
|
|
||||||
: couple.am.displayName(
|
|
||||||
fallback: mode == CoupleBandeauMode.parent
|
|
||||||
? 'Nounou'
|
|
||||||
: 'Parent',
|
|
||||||
),
|
|
||||||
fallbackIcon: mode == CoupleBandeauMode.parent
|
|
||||||
? Icons.volunteer_activism
|
|
||||||
: Icons.person_outline,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
width: 28,
|
width: 28,
|
||||||
child: showChevron
|
child: showChevron
|
||||||
? const Icon(
|
? const Icon(
|
||||||
Icons.keyboard_arrow_down,
|
Icons.keyboard_arrow_down,
|
||||||
color: QuotidienTheme.ink,
|
color: QuotidienTheme.ink,
|
||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -279,24 +304,22 @@ class _CoupleBandeauSkeleton extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return ColorFiltered(
|
||||||
height: 90,
|
colorFilter: ColorFilter.mode(
|
||||||
decoration: BoxDecoration(
|
Colors.white.withValues(alpha: 0.5),
|
||||||
image: DecorationImage(
|
BlendMode.lighten,
|
||||||
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
|
),
|
||||||
fit: BoxFit.fill,
|
child: Carte.bandeau(
|
||||||
colorFilter: ColorFilter.mode(
|
assetPath: QuotidienTheme.bandeauLime,
|
||||||
Colors.white.withValues(alpha: 0.5),
|
height: 90,
|
||||||
BlendMode.lighten,
|
child: const Center(
|
||||||
|
child: SizedBox(
|
||||||
|
width: 26,
|
||||||
|
height: 26,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
alignment: Alignment.center,
|
|
||||||
child: const SizedBox(
|
|
||||||
width: 26,
|
|
||||||
height: 26,
|
|
||||||
child: CircularProgressIndicator(strokeWidth: 2),
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -306,14 +329,9 @@ class _CoupleBandeauEmpty extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return Carte.bandeau(
|
||||||
|
assetPath: QuotidienTheme.bandeauLime,
|
||||||
height: 90,
|
height: 90,
|
||||||
decoration: const BoxDecoration(
|
|
||||||
image: DecorationImage(
|
|
||||||
image: AssetImage(QuotidienTheme.bandeauLime), // Un asset existant par défaut
|
|
||||||
fit: BoxFit.fill,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
@@ -342,38 +360,35 @@ class _CoupleBandeauError extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return ColorFiltered(
|
||||||
height: 90,
|
colorFilter: ColorFilter.mode(
|
||||||
decoration: BoxDecoration(
|
QuotidienTheme.coral.withValues(alpha: 0.3),
|
||||||
image: DecorationImage(
|
BlendMode.srcATop,
|
||||||
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
|
|
||||||
fit: BoxFit.fill,
|
|
||||||
colorFilter: ColorFilter.mode(
|
|
||||||
QuotidienTheme.coral.withValues(alpha: 0.3),
|
|
||||||
BlendMode.srcATop,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
child: Carte.bandeau(
|
||||||
child: Row(
|
assetPath: QuotidienTheme.bandeauLime,
|
||||||
children: [
|
height: 90,
|
||||||
const Icon(Icons.error_outline, color: QuotidienTheme.ink),
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
const SizedBox(width: 12),
|
child: Row(
|
||||||
Expanded(
|
children: [
|
||||||
child: Text(
|
const Icon(Icons.error_outline, color: QuotidienTheme.ink),
|
||||||
message,
|
const SizedBox(width: 12),
|
||||||
style: GoogleFonts.merriweather(
|
Expanded(
|
||||||
fontSize: 13,
|
child: Text(
|
||||||
color: QuotidienTheme.ink,
|
message,
|
||||||
|
style: GoogleFonts.merriweather(
|
||||||
|
fontSize: 13,
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
if (onRetry != null)
|
||||||
if (onRetry != null)
|
TextButton(
|
||||||
TextButton(
|
onPressed: onRetry,
|
||||||
onPressed: onRetry,
|
child: const Text('Réessayer'),
|
||||||
child: const Text('Réessayer'),
|
),
|
||||||
),
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -183,15 +183,16 @@ class _UserMenu extends StatelessWidget {
|
|||||||
title: Text('Profil'),
|
title: Text('Profil'),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const PopupMenuItem(
|
if (onSearchAmTap != null)
|
||||||
value: 'search_am',
|
const PopupMenuItem(
|
||||||
child: ListTile(
|
value: 'search_am',
|
||||||
dense: true,
|
child: ListTile(
|
||||||
contentPadding: EdgeInsets.zero,
|
dense: true,
|
||||||
leading: Icon(Icons.search, size: 20),
|
contentPadding: EdgeInsets.zero,
|
||||||
title: Text('Recherche AM'),
|
leading: Icon(Icons.search, size: 20),
|
||||||
|
title: Text('Recherche AM'),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
const PopupMenuItem(
|
const PopupMenuItem(
|
||||||
value: 'settings',
|
value: 'settings',
|
||||||
child: ListTile(
|
child: ListTile(
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ abstract final class QuotidienTheme {
|
|||||||
static const Color ink = Color(0xFF2F2F2F);
|
static const Color ink = Color(0xFF2F2F2F);
|
||||||
static const Color ivory = Color(0xFFFFFEF9);
|
static const Color ivory = Color(0xFFFFFEF9);
|
||||||
static const Color turquoise = Color(0xFF8AD0C8);
|
static const Color turquoise = Color(0xFF8AD0C8);
|
||||||
|
static const Color peach = Color(0xFFFFCCB6);
|
||||||
static const Color lavender = Color(0xFFC6A3D8);
|
static const Color lavender = Color(0xFFC6A3D8);
|
||||||
static const Color coral = Color(0xFFF4A28C);
|
static const Color coral = Color(0xFFF4A28C);
|
||||||
static const Color softGreenPill = Color(0xFFB8D9A8);
|
static const Color softGreenPill = Color(0xFFB8D9A8);
|
||||||
@@ -48,6 +49,7 @@ abstract final class QuotidienTheme {
|
|||||||
'assets/images/bg_turquoise_pill.png';
|
'assets/images/bg_turquoise_pill.png';
|
||||||
static const String pillLavenderAsset =
|
static const String pillLavenderAsset =
|
||||||
'assets/images/bg_lavender_pill.png';
|
'assets/images/bg_lavender_pill.png';
|
||||||
|
static const String pillCorailAsset = 'assets/images/bg_corail_pill.png';
|
||||||
|
|
||||||
/// Trait crayon gris (2400×28, transparent) : séparateurs bandeau / corps /
|
/// Trait crayon gris (2400×28, transparent) : séparateurs bandeau / corps /
|
||||||
/// footer. Version verticale (28×2400) entre les colonnes.
|
/// footer. Version verticale (28×2400) entre les colonnes.
|
||||||
|
|||||||
@@ -1,6 +1,22 @@
|
|||||||
# Generated by pub
|
# Generated by pub
|
||||||
# See https://dart.dev/tools/pub/glossary#lockfile
|
# See https://dart.dev/tools/pub/glossary#lockfile
|
||||||
packages:
|
packages:
|
||||||
|
archive:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: archive
|
||||||
|
sha256: "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "4.3.0"
|
||||||
|
args:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: args
|
||||||
|
sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.7.0"
|
||||||
async:
|
async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -25,6 +41,22 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.4.0"
|
version: "1.4.0"
|
||||||
|
checked_yaml:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: checked_yaml
|
||||||
|
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.0.3"
|
||||||
|
cli_util:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: cli_util
|
||||||
|
sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.4.2"
|
||||||
clock:
|
clock:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -150,6 +182,14 @@ packages:
|
|||||||
description: flutter
|
description: flutter
|
||||||
source: sdk
|
source: sdk
|
||||||
version: "0.0.0"
|
version: "0.0.0"
|
||||||
|
flutter_launcher_icons:
|
||||||
|
dependency: "direct dev"
|
||||||
|
description:
|
||||||
|
name: flutter_launcher_icons
|
||||||
|
sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.13.1"
|
||||||
flutter_lints:
|
flutter_lints:
|
||||||
dependency: "direct dev"
|
dependency: "direct dev"
|
||||||
description:
|
description:
|
||||||
@@ -213,6 +253,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.0.2"
|
version: "4.0.2"
|
||||||
|
image:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: image
|
||||||
|
sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "4.10.1"
|
||||||
image_picker:
|
image_picker:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -293,6 +341,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.6.7"
|
version: "0.6.7"
|
||||||
|
json_annotation:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: json_annotation
|
||||||
|
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "4.9.0"
|
||||||
leak_tracker:
|
leak_tracker:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -461,6 +517,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.8"
|
version: "2.1.8"
|
||||||
|
posix:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: posix
|
||||||
|
sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "6.5.2"
|
||||||
provider:
|
provider:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -722,6 +786,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.0"
|
version: "1.1.0"
|
||||||
|
yaml:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: yaml
|
||||||
|
sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "3.1.4"
|
||||||
sdks:
|
sdks:
|
||||||
dart: ">=3.7.0-0 <4.0.0"
|
dart: ">=3.7.0-0 <4.0.0"
|
||||||
flutter: ">=3.19.0"
|
flutter: ">=3.19.0"
|
||||||
|
|||||||