Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4007d7010e | ||
|
|
4261667198 | ||
|
|
15e2d8d850 | ||
|
|
34a516d509 | ||
|
|
da71803852 | ||
|
|
2380aa9826 | ||
|
|
c952113099 | ||
|
|
8204669ec9 | ||
|
|
76ab0f340a | ||
|
|
a0a5e15b04 | ||
|
|
823ea6cd22 | ||
|
|
dfac075a74 | ||
|
|
2d8b857a84 | ||
|
|
147051821a |
@@ -17,6 +17,7 @@ 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 { AbsencesGardeModule } from './modules/absences-garde';
|
||||||
|
import { CardsModule } from './modules/cards';
|
||||||
import { RelaisModule } from './routes/relais/relais.module';
|
import { RelaisModule } from './routes/relais/relais.module';
|
||||||
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
||||||
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||||
@@ -58,6 +59,7 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
|||||||
AppConfigModule,
|
AppConfigModule,
|
||||||
DocumentsLegauxModule,
|
DocumentsLegauxModule,
|
||||||
AbsencesGardeModule,
|
AbsencesGardeModule,
|
||||||
|
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 { AbsencesGarde } from './absences_garde.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
import { CardType } from './card_types.entity';
|
||||||
|
import { CardAudienceMember } from './card_audience_members.entity';
|
||||||
|
import { CardResponse } from './card_responses.entity';
|
||||||
|
|
||||||
|
export enum CardInstanceStatutType {
|
||||||
|
OUVERTE = 'ouverte',
|
||||||
|
REFUSEE = 'refusee',
|
||||||
|
TRAITEE = 'traitee',
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum CardOperationType {
|
||||||
|
CREATE = 'create',
|
||||||
|
UPDATE = 'update',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_instances', { schema: 'public' })
|
||||||
|
export class CardInstance {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'type_code', type: 'varchar', length: 64 })
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardType, { onDelete: 'RESTRICT' })
|
||||||
|
@JoinColumn({ name: 'type_code', referencedColumnName: 'code' })
|
||||||
|
type: CardType;
|
||||||
|
|
||||||
|
@Column({ name: 'id_placement', type: 'uuid' })
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AmChildren, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_placement', referencedColumnName: 'id' })
|
||||||
|
placement: AmChildren;
|
||||||
|
|
||||||
|
@Column({ name: 'id_absence', type: 'uuid', nullable: true })
|
||||||
|
id_absence?: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AbsencesGarde, { nullable: true, onDelete: 'SET NULL' })
|
||||||
|
@JoinColumn({ name: 'id_absence', referencedColumnName: 'id' })
|
||||||
|
absence?: AbsencesGarde;
|
||||||
|
|
||||||
|
@Column({ name: 'cree_par', type: 'uuid', nullable: true })
|
||||||
|
cree_par?: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => Users, { nullable: true, onDelete: 'SET NULL' })
|
||||||
|
@JoinColumn({ name: 'cree_par', referencedColumnName: 'id' })
|
||||||
|
createdBy?: Users;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardOperationType,
|
||||||
|
enumName: 'card_operation_type',
|
||||||
|
name: 'operation',
|
||||||
|
default: CardOperationType.CREATE,
|
||||||
|
})
|
||||||
|
operation: CardOperationType;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardInstanceStatutType,
|
||||||
|
enumName: 'card_instance_statut_type',
|
||||||
|
name: 'statut',
|
||||||
|
default: CardInstanceStatutType.OUVERTE,
|
||||||
|
})
|
||||||
|
statut: CardInstanceStatutType;
|
||||||
|
|
||||||
|
@Column({ name: 'payload', type: 'jsonb', default: {} })
|
||||||
|
payload: Record<string, unknown>;
|
||||||
|
|
||||||
|
@Column({ name: 'purge_at', type: 'timestamptz' })
|
||||||
|
purge_at: Date;
|
||||||
|
|
||||||
|
@OneToMany(() => CardAudienceMember, (m) => m.card)
|
||||||
|
audience: CardAudienceMember[];
|
||||||
|
|
||||||
|
@OneToMany(() => CardResponse, (r) => r.card)
|
||||||
|
responses: CardResponse[];
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||||
|
modifie_le: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { CardInstance } from './card_instances.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
|
||||||
|
export enum CardResponseActionType {
|
||||||
|
ACCEPT = 'accept',
|
||||||
|
REFUSE = 'refuse',
|
||||||
|
ACK = 'ack',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_responses', { schema: 'public' })
|
||||||
|
export class CardResponse {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'id_card', type: 'uuid' })
|
||||||
|
id_card: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardInstance, (c) => c.responses, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_card', referencedColumnName: 'id' })
|
||||||
|
card: CardInstance;
|
||||||
|
|
||||||
|
@Column({ name: 'id_utilisateur', type: 'uuid' })
|
||||||
|
id_utilisateur: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => Users, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_utilisateur', referencedColumnName: 'id' })
|
||||||
|
user: Users;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardResponseActionType,
|
||||||
|
enumName: 'card_response_action_type',
|
||||||
|
name: 'action',
|
||||||
|
})
|
||||||
|
action: CardResponseActionType;
|
||||||
|
|
||||||
|
@Column({ name: 'comment', type: 'text', nullable: true })
|
||||||
|
comment?: string;
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
PrimaryColumn,
|
||||||
|
UpdateDateColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
|
||||||
|
export enum CardResponseModeType {
|
||||||
|
NONE = 'none',
|
||||||
|
ACK = 'ack',
|
||||||
|
ACCEPT_REFUSE = 'accept_refuse',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_types', { schema: 'public' })
|
||||||
|
export class CardType {
|
||||||
|
@PrimaryColumn({ name: 'code', type: 'varchar', length: 64 })
|
||||||
|
code: string;
|
||||||
|
|
||||||
|
@Column({ name: 'system', type: 'boolean', default: true })
|
||||||
|
system: boolean;
|
||||||
|
|
||||||
|
@Column({ name: 'titre', type: 'varchar', length: 120 })
|
||||||
|
titre: string;
|
||||||
|
|
||||||
|
@Column({ name: 'emitter_roles', type: 'text', array: true })
|
||||||
|
emitter_roles: string[];
|
||||||
|
|
||||||
|
@Column({ name: 'recipient_roles', type: 'text', array: true })
|
||||||
|
recipient_roles: string[];
|
||||||
|
|
||||||
|
@Column({ name: 'audience_resolver', type: 'varchar', length: 64 })
|
||||||
|
audience_resolver: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardResponseModeType,
|
||||||
|
enumName: 'card_response_mode_type',
|
||||||
|
name: 'response_mode',
|
||||||
|
})
|
||||||
|
response_mode: CardResponseModeType;
|
||||||
|
|
||||||
|
@Column({ name: 'retention_days', type: 'int', default: 14 })
|
||||||
|
retention_days: number;
|
||||||
|
|
||||||
|
@Column({ name: 'couleur', type: 'varchar', length: 32, nullable: true })
|
||||||
|
couleur?: string;
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||||
|
modifie_le: Date;
|
||||||
|
}
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
|
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
@@ -9,6 +11,14 @@ import { AbsencesGardeService } from './absences-garde.service';
|
|||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
||||||
|
JwtModule.registerAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: (config: ConfigService) => ({
|
||||||
|
secret: config.get('jwt.accessSecret'),
|
||||||
|
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
|
||||||
|
}),
|
||||||
|
inject: [ConfigService],
|
||||||
|
}),
|
||||||
],
|
],
|
||||||
controllers: [AbsencesGardeController],
|
controllers: [AbsencesGardeController],
|
||||||
providers: [AbsencesGardeService],
|
providers: [AbsencesGardeService],
|
||||||
|
|||||||
@@ -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 === StatutAbsenceGardeType.EN_ATTENTE &&
|
||||||
next === StatutAbsenceGardeType.EN_ATTENTE
|
(row.statut === StatutAbsenceGardeType.REFUSE ||
|
||||||
|
row.statut === StatutAbsenceGardeType.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é');
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import {
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Headers,
|
||||||
|
MessageEvent,
|
||||||
|
Query,
|
||||||
|
Sse,
|
||||||
|
UnauthorizedException,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
ApiBearerAuth,
|
||||||
|
ApiOperation,
|
||||||
|
ApiQuery,
|
||||||
|
ApiTags,
|
||||||
|
} from '@nestjs/swagger';
|
||||||
|
import { ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtService } from '@nestjs/jwt';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
|
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||||
|
import { Public } from 'src/common/decorators/public.decorator';
|
||||||
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SSE Cartes — #195
|
||||||
|
* Auth : Bearer (recommandé) ou `?access_token=` (EventSource navigateur).
|
||||||
|
*/
|
||||||
|
@ApiTags('Cartes')
|
||||||
|
@Controller('cards')
|
||||||
|
export class CardsRealtimeController {
|
||||||
|
constructor(
|
||||||
|
private readonly realtime: CardsRealtimeService,
|
||||||
|
private readonly jwtService: JwtService,
|
||||||
|
private readonly configService: ConfigService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Sse('stream')
|
||||||
|
@Public()
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Flux SSE bulles (card.created|updated|deleted, response.added) — #195',
|
||||||
|
})
|
||||||
|
@ApiQuery({
|
||||||
|
name: 'access_token',
|
||||||
|
required: false,
|
||||||
|
description: 'JWT si pas de header Authorization (EventSource)',
|
||||||
|
})
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
async stream(
|
||||||
|
@Headers('authorization') authorization?: string,
|
||||||
|
@Query('access_token') accessToken?: string,
|
||||||
|
): Promise<Observable<MessageEvent>> {
|
||||||
|
const userId = await this.resolveUserId(authorization, accessToken);
|
||||||
|
return this.realtime.streamFor(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Variante gardée (clients qui envoient Bearer correctement). */
|
||||||
|
@Get('stream/info')
|
||||||
|
@UseGuards(AuthGuard, RolesGuard)
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
@ApiOperation({ summary: 'Debug : abonnés SSE pour mon user — #195' })
|
||||||
|
info(@User('id') userId: string) {
|
||||||
|
return {
|
||||||
|
user_id: userId,
|
||||||
|
subscribers: this.realtime.subscriberCount(userId),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolveUserId(
|
||||||
|
authorization?: string,
|
||||||
|
accessToken?: string,
|
||||||
|
): Promise<string> {
|
||||||
|
let token = accessToken?.trim();
|
||||||
|
if (!token && authorization?.startsWith('Bearer ')) {
|
||||||
|
token = authorization.slice(7).trim();
|
||||||
|
}
|
||||||
|
if (!token) {
|
||||||
|
throw new UnauthorizedException('Token manquant (Bearer ou access_token)');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const payload = await this.jwtService.verifyAsync<{ sub: string }>(token, {
|
||||||
|
secret: this.configService.get<string>('jwt.accessSecret'),
|
||||||
|
});
|
||||||
|
if (!payload?.sub) throw new UnauthorizedException('Token invalide');
|
||||||
|
return payload.sub;
|
||||||
|
} catch {
|
||||||
|
throw new UnauthorizedException('Token invalide ou expiré');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { MessageEvent } from '@nestjs/common';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
describe('CardsRealtimeService (#195)', () => {
|
||||||
|
let service: CardsRealtimeService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
service = new CardsRealtimeService();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
service.onModuleDestroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('émet card.created aux abonnés du user', async () => {
|
||||||
|
const events: MessageEvent[] = [];
|
||||||
|
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
|
||||||
|
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
expect(events[0]?.type).toBe('heartbeat');
|
||||||
|
expect(service.subscriberCount('user-a')).toBe(1);
|
||||||
|
|
||||||
|
service.emitToUsers(['user-a', 'user-b'], 'card.created', 'card-1', {
|
||||||
|
id: 'card-1',
|
||||||
|
});
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
|
||||||
|
const created = events.find((e) => e.type === 'card.created');
|
||||||
|
expect(created).toBeDefined();
|
||||||
|
expect((created!.data as { card_id: string }).card_id).toBe('card-1');
|
||||||
|
expect(service.subscriberCount('user-b')).toBe(0);
|
||||||
|
|
||||||
|
sub.unsubscribe();
|
||||||
|
expect(service.subscriberCount('user-a')).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ne diffuse pas aux users non abonnés', async () => {
|
||||||
|
const events: MessageEvent[] = [];
|
||||||
|
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
const before = events.length;
|
||||||
|
service.emitToUsers(['user-b'], 'card.updated', 'x');
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
expect(events.length).toBe(before);
|
||||||
|
sub.unsubscribe();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
import { Injectable, MessageEvent, OnModuleDestroy } from '@nestjs/common';
|
||||||
|
import { Observable, Subject, interval, merge, takeUntil } from 'rxjs';
|
||||||
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
|
export type CardRealtimeEventType =
|
||||||
|
| 'card.created'
|
||||||
|
| 'card.updated'
|
||||||
|
| 'card.deleted'
|
||||||
|
| 'response.added'
|
||||||
|
| 'heartbeat';
|
||||||
|
|
||||||
|
export interface CardRealtimePayload {
|
||||||
|
event: CardRealtimeEventType;
|
||||||
|
card_id?: string;
|
||||||
|
data?: unknown;
|
||||||
|
at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bus SSE in-memory par utilisateur (V1 mono-instance).
|
||||||
|
* Rooms = userId (audience carte).
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class CardsRealtimeService implements OnModuleDestroy {
|
||||||
|
private readonly byUser = new Map<string, Set<Subject<CardRealtimePayload>>>();
|
||||||
|
private readonly destroy$ = new Subject<void>();
|
||||||
|
|
||||||
|
onModuleDestroy(): void {
|
||||||
|
this.destroy$.next();
|
||||||
|
this.destroy$.complete();
|
||||||
|
for (const set of this.byUser.values()) {
|
||||||
|
for (const s of set) s.complete();
|
||||||
|
}
|
||||||
|
this.byUser.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Flux SSE pour un utilisateur authentifié. */
|
||||||
|
streamFor(userId: string): Observable<MessageEvent> {
|
||||||
|
const subject = new Subject<CardRealtimePayload>();
|
||||||
|
let set = this.byUser.get(userId);
|
||||||
|
if (!set) {
|
||||||
|
set = new Set();
|
||||||
|
this.byUser.set(userId, set);
|
||||||
|
}
|
||||||
|
set.add(subject);
|
||||||
|
|
||||||
|
const heartbeat$ = interval(25_000).pipe(
|
||||||
|
map(
|
||||||
|
(): CardRealtimePayload => ({
|
||||||
|
event: 'heartbeat',
|
||||||
|
at: new Date().toISOString(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
return new Observable<MessageEvent>((observer) => {
|
||||||
|
const sub = merge(subject, heartbeat$)
|
||||||
|
.pipe(takeUntil(this.destroy$))
|
||||||
|
.subscribe({
|
||||||
|
next: (payload) =>
|
||||||
|
observer.next({
|
||||||
|
type: payload.event,
|
||||||
|
data: payload,
|
||||||
|
} as MessageEvent),
|
||||||
|
error: (err) => observer.error(err),
|
||||||
|
complete: () => observer.complete(),
|
||||||
|
});
|
||||||
|
|
||||||
|
// ping initial
|
||||||
|
subject.next({
|
||||||
|
event: 'heartbeat',
|
||||||
|
at: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
sub.unsubscribe();
|
||||||
|
set!.delete(subject);
|
||||||
|
subject.complete();
|
||||||
|
if (set!.size === 0) this.byUser.delete(userId);
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
emitToUsers(
|
||||||
|
userIds: string[],
|
||||||
|
event: Exclude<CardRealtimeEventType, 'heartbeat'>,
|
||||||
|
cardId: string | undefined,
|
||||||
|
data?: unknown,
|
||||||
|
): void {
|
||||||
|
const unique = [...new Set(userIds.filter(Boolean))];
|
||||||
|
const payload: CardRealtimePayload = {
|
||||||
|
event,
|
||||||
|
card_id: cardId,
|
||||||
|
data,
|
||||||
|
at: new Date().toISOString(),
|
||||||
|
};
|
||||||
|
for (const uid of unique) {
|
||||||
|
const set = this.byUser.get(uid);
|
||||||
|
if (!set) continue;
|
||||||
|
for (const s of set) s.next(payload);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Test / debug : nombre d’abonnés actifs. */
|
||||||
|
subscriberCount(userId?: string): number {
|
||||||
|
if (userId) return this.byUser.get(userId)?.size ?? 0;
|
||||||
|
let n = 0;
|
||||||
|
for (const s of this.byUser.values()) n += s.size;
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
Delete,
|
||||||
|
Get,
|
||||||
|
HttpCode,
|
||||||
|
HttpStatus,
|
||||||
|
Param,
|
||||||
|
ParseUUIDPipe,
|
||||||
|
Patch,
|
||||||
|
Post,
|
||||||
|
Query,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
ApiBearerAuth,
|
||||||
|
ApiBody,
|
||||||
|
ApiOperation,
|
||||||
|
ApiQuery,
|
||||||
|
ApiResponse,
|
||||||
|
ApiTags,
|
||||||
|
} from '@nestjs/swagger';
|
||||||
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
|
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||||
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import {
|
||||||
|
CarteDto,
|
||||||
|
CreerCarteDto,
|
||||||
|
ListeCartesDto,
|
||||||
|
MajCarteDto,
|
||||||
|
RepondreCarteDto,
|
||||||
|
} from './dto/cards.dto';
|
||||||
|
|
||||||
|
@ApiTags('Cartes')
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
@Controller('cards')
|
||||||
|
@UseGuards(AuthGuard, RolesGuard)
|
||||||
|
export class CardsController {
|
||||||
|
constructor(private readonly cardsService: CardsService) {}
|
||||||
|
|
||||||
|
@Get('types')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Types SYSTEM émissibles pour mon rôle — #194' })
|
||||||
|
listerTypes(@User('role') role: RoleType) {
|
||||||
|
return this.cardsService.listerTypes(role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Feed bulles de l’utilisateur — #194' })
|
||||||
|
@ApiQuery({ name: 'placementId', required: false })
|
||||||
|
@ApiResponse({ status: 200, type: ListeCartesDto })
|
||||||
|
lister(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Query('placementId') placementId?: string,
|
||||||
|
): Promise<ListeCartesDto> {
|
||||||
|
return this.cardsService.lister(userId, role, placementId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@HttpCode(HttpStatus.CREATED)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Créer une bulle (+ hook absences_garde) — #194',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: CreerCarteDto })
|
||||||
|
@ApiResponse({ status: 201, type: CarteDto })
|
||||||
|
creer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Body() dto: CreerCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.creer(userId, role, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post(':id/respond')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Répondre (accept / refuse / ack) — #194' })
|
||||||
|
@ApiBody({ type: RepondreCarteDto })
|
||||||
|
repondre(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
@Body() dto: RepondreCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.repondre(userId, role, id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Modifier dates (créateur, ouverte/refusée) — #194',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: MajCarteDto })
|
||||||
|
maj(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
@Body() dto: MajCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.majEnAttente(userId, role, id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
@ApiOperation({ summary: 'Supprimer bulle (+ absence si non traitée) — #194' })
|
||||||
|
async supprimer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
await this.cardsService.supprimer(userId, role, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||||
|
import { JwtModule } from '@nestjs/jwt';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { AbsencesGardeModule } from '../absences-garde';
|
||||||
|
import { CardType } from 'src/entities/card_types.entity';
|
||||||
|
import { CardInstance } from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import { CardResponse } from 'src/entities/card_responses.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { CardsController } from './cards.controller';
|
||||||
|
import { CardsRealtimeController } from './cards-realtime.controller';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
AbsencesGardeModule,
|
||||||
|
TypeOrmModule.forFeature([
|
||||||
|
CardType,
|
||||||
|
CardInstance,
|
||||||
|
CardAudienceMember,
|
||||||
|
CardResponse,
|
||||||
|
AmChildren,
|
||||||
|
ParentsChildren,
|
||||||
|
]),
|
||||||
|
JwtModule.registerAsync({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
useFactory: (config: ConfigService) => ({
|
||||||
|
secret: config.get('jwt.accessSecret'),
|
||||||
|
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
|
||||||
|
}),
|
||||||
|
inject: [ConfigService],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
controllers: [CardsController, CardsRealtimeController],
|
||||||
|
providers: [CardsService, CardsRealtimeService],
|
||||||
|
exports: [CardsService, CardsRealtimeService],
|
||||||
|
})
|
||||||
|
export class CardsModule {}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
|
import { ForbiddenException } from '@nestjs/common';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||||
|
import { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||||
|
import {
|
||||||
|
CardInstance,
|
||||||
|
CardInstanceStatutType,
|
||||||
|
CardOperationType,
|
||||||
|
} from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import { CardResponse } from 'src/entities/card_responses.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { StatutAbsenceGardeType, TypeAbsenceGardeType } from 'src/entities/absences_garde.entity';
|
||||||
|
|
||||||
|
describe('CardsService (#194)', () => {
|
||||||
|
let service: CardsService;
|
||||||
|
|
||||||
|
const typesRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
|
const cardsRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(async (x) => ({ ...x, id: x.id ?? 'card-1', cree_le: new Date(), modifie_le: new Date() })),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
delete: jest.fn(),
|
||||||
|
createQueryBuilder: jest.fn(),
|
||||||
|
manager: { query: jest.fn() },
|
||||||
|
};
|
||||||
|
const audienceRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
find: jest.fn(),
|
||||||
|
};
|
||||||
|
const responsesRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(),
|
||||||
|
};
|
||||||
|
const amChildrenRepo = { findOne: jest.fn() };
|
||||||
|
const parentsChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
|
const absencesService = {
|
||||||
|
creer: jest.fn(),
|
||||||
|
maj: jest.fn(),
|
||||||
|
supprimer: jest.fn(),
|
||||||
|
};
|
||||||
|
const realtime = { emitToUsers: jest.fn() };
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
CardsService,
|
||||||
|
{ provide: getRepositoryToken(CardType), useValue: typesRepo },
|
||||||
|
{ provide: getRepositoryToken(CardInstance), useValue: cardsRepo },
|
||||||
|
{ provide: getRepositoryToken(CardAudienceMember), useValue: audienceRepo },
|
||||||
|
{ provide: getRepositoryToken(CardResponse), useValue: responsesRepo },
|
||||||
|
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||||
|
{ provide: getRepositoryToken(ParentsChildren), useValue: parentsChildrenRepo },
|
||||||
|
{ provide: AbsencesGardeService, useValue: absencesService },
|
||||||
|
{ provide: CardsRealtimeService, useValue: realtime },
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
service = module.get(CardsService);
|
||||||
|
jest.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('AM crée congé → absence + carte ouverte + audience parents', async () => {
|
||||||
|
typesRepo.findOne.mockResolvedValue({
|
||||||
|
code: 'conge_am',
|
||||||
|
system: true,
|
||||||
|
titre: 'Congé AM',
|
||||||
|
emitter_roles: [RoleType.ASSISTANTE_MATERNELLE],
|
||||||
|
recipient_roles: [RoleType.PARENT],
|
||||||
|
audience_resolver: 'couple_parents',
|
||||||
|
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||||
|
retention_days: 14,
|
||||||
|
couleur: 'lavender',
|
||||||
|
});
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
absencesService.creer.mockResolvedValue({
|
||||||
|
id: 'abs-1',
|
||||||
|
type: TypeAbsenceGardeType.CONGE_AM,
|
||||||
|
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
});
|
||||||
|
parentsChildrenRepo.find.mockResolvedValue([
|
||||||
|
{ parentId: 'p-1', enfantId: 'e-1' },
|
||||||
|
{ parentId: 'p-2', enfantId: 'e-1' },
|
||||||
|
]);
|
||||||
|
cardsRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'card-1',
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
id_absence: 'abs-1',
|
||||||
|
cree_par: 'am-1',
|
||||||
|
operation: CardOperationType.CREATE,
|
||||||
|
statut: CardInstanceStatutType.OUVERTE,
|
||||||
|
payload: { date_debut: '2026-11-01', date_fin: '2026-11-07' },
|
||||||
|
purge_at: new Date(),
|
||||||
|
cree_le: new Date(),
|
||||||
|
modifie_le: new Date(),
|
||||||
|
type: {
|
||||||
|
titre: 'Congé AM',
|
||||||
|
couleur: 'lavender',
|
||||||
|
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||||
|
retention_days: 14,
|
||||||
|
},
|
||||||
|
responses: [],
|
||||||
|
audience: [
|
||||||
|
{ id_utilisateur: 'am-1' },
|
||||||
|
{ id_utilisateur: 'p-1' },
|
||||||
|
{ id_utilisateur: 'p-2' },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
date_debut: '2026-11-01',
|
||||||
|
date_fin: '2026-11-07',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(absencesService.creer).toHaveBeenCalled();
|
||||||
|
expect(audienceRepo.save).toHaveBeenCalled();
|
||||||
|
expect(realtime.emitToUsers).toHaveBeenCalledWith(
|
||||||
|
['am-1', 'p-1', 'p-2'],
|
||||||
|
'card.created',
|
||||||
|
'card-1',
|
||||||
|
expect.any(Object),
|
||||||
|
);
|
||||||
|
expect(res.type_code).toBe('conge_am');
|
||||||
|
expect(res.statut).toBe(CardInstanceStatutType.OUVERTE);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parent ne peut pas émettre conge_am', async () => {
|
||||||
|
typesRepo.findOne.mockResolvedValue({
|
||||||
|
code: 'conge_am',
|
||||||
|
system: true,
|
||||||
|
emitter_roles: [RoleType.ASSISTANTE_MATERNELLE],
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
service.creer('p-1', RoleType.PARENT, {
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
date_debut: '2026-11-01',
|
||||||
|
date_fin: '2026-11-07',
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(ForbiddenException);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,489 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { IsNull, Repository } from 'typeorm';
|
||||||
|
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||||
|
import {
|
||||||
|
StatutAbsenceGardeType,
|
||||||
|
TypeAbsenceGardeType,
|
||||||
|
} from 'src/entities/absences_garde.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||||
|
import {
|
||||||
|
CardInstance,
|
||||||
|
CardInstanceStatutType,
|
||||||
|
CardOperationType,
|
||||||
|
} from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import {
|
||||||
|
CardResponse,
|
||||||
|
CardResponseActionType,
|
||||||
|
} from 'src/entities/card_responses.entity';
|
||||||
|
import {
|
||||||
|
CarteDto,
|
||||||
|
CreerCarteDto,
|
||||||
|
ListeCartesDto,
|
||||||
|
MajCarteDto,
|
||||||
|
RepondreCarteDto,
|
||||||
|
} from './dto/cards.dto';
|
||||||
|
import { CardsRealtimeService } from './cards-realtime.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CardsService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(CardType)
|
||||||
|
private readonly typesRepo: Repository<CardType>,
|
||||||
|
@InjectRepository(CardInstance)
|
||||||
|
private readonly cardsRepo: Repository<CardInstance>,
|
||||||
|
@InjectRepository(CardAudienceMember)
|
||||||
|
private readonly audienceRepo: Repository<CardAudienceMember>,
|
||||||
|
@InjectRepository(CardResponse)
|
||||||
|
private readonly responsesRepo: Repository<CardResponse>,
|
||||||
|
@InjectRepository(AmChildren)
|
||||||
|
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||||
|
@InjectRepository(ParentsChildren)
|
||||||
|
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||||
|
private readonly absencesService: AbsencesGardeService,
|
||||||
|
private readonly realtime: CardsRealtimeService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async listerTypes(role: RoleType): Promise<CardType[]> {
|
||||||
|
const all = await this.typesRepo.find({ where: { system: true } });
|
||||||
|
return all.filter((t) => t.emitter_roles.includes(role));
|
||||||
|
}
|
||||||
|
|
||||||
|
async lister(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
placementId?: string,
|
||||||
|
): Promise<ListeCartesDto> {
|
||||||
|
const qb = this.cardsRepo
|
||||||
|
.createQueryBuilder('c')
|
||||||
|
.innerJoin('c.audience', 'aud', 'aud.id_utilisateur = :userId', { userId })
|
||||||
|
.leftJoinAndSelect('c.type', 'type')
|
||||||
|
.leftJoinAndSelect('c.responses', 'responses')
|
||||||
|
.where('c.purge_at > now()')
|
||||||
|
.orderBy(
|
||||||
|
`CASE c.statut WHEN 'refusee' THEN 0 WHEN 'ouverte' THEN 1 ELSE 2 END`,
|
||||||
|
'ASC',
|
||||||
|
)
|
||||||
|
.addOrderBy('c.modifie_le', 'DESC');
|
||||||
|
|
||||||
|
if (placementId) {
|
||||||
|
await this.assertPlacementAccess(userId, role, placementId);
|
||||||
|
qb.andWhere('c.id_placement = :placementId', { placementId });
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = await qb.getMany();
|
||||||
|
return {
|
||||||
|
items: rows.map((c) => this.toDto(c, userId)),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async creer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
dto: CreerCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
if (dto.date_fin < dto.date_debut) {
|
||||||
|
throw new BadRequestException('date_fin < date_debut');
|
||||||
|
}
|
||||||
|
|
||||||
|
const type = await this.typesRepo.findOne({ where: { code: dto.type_code } });
|
||||||
|
if (!type || !type.system) {
|
||||||
|
throw new NotFoundException('Type de carte inconnu');
|
||||||
|
}
|
||||||
|
if (!type.emitter_roles.includes(role)) {
|
||||||
|
throw new ForbiddenException('Vous ne pouvez pas émettre ce type de carte');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placement = await this.assertPlacementAccess(
|
||||||
|
userId,
|
||||||
|
role,
|
||||||
|
dto.id_placement,
|
||||||
|
);
|
||||||
|
const operation = dto.operation ?? CardOperationType.CREATE;
|
||||||
|
|
||||||
|
let absenceId = dto.id_absence;
|
||||||
|
const absenceType = this.mapAbsenceType(dto.type_code);
|
||||||
|
|
||||||
|
if (operation === CardOperationType.CREATE) {
|
||||||
|
const absence = await this.absencesService.creer(userId, role, {
|
||||||
|
id_placement: dto.id_placement,
|
||||||
|
type: absenceType,
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
});
|
||||||
|
absenceId = absence.id;
|
||||||
|
} else {
|
||||||
|
if (!absenceId) {
|
||||||
|
throw new BadRequestException('id_absence requis pour operation=update');
|
||||||
|
}
|
||||||
|
await this.absencesService.maj(userId, role, absenceId, {
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
// Congé accepté modifié → repasse en attente via cartes respond flow;
|
||||||
|
// pour absence enfant update immédiat déjà fait.
|
||||||
|
...(dto.type_code === 'conge_am'
|
||||||
|
? { statut: StatutAbsenceGardeType.EN_ATTENTE }
|
||||||
|
: {}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const statutInitial =
|
||||||
|
type.response_mode === CardResponseModeType.NONE
|
||||||
|
? CardInstanceStatutType.TRAITEE
|
||||||
|
: CardInstanceStatutType.OUVERTE;
|
||||||
|
|
||||||
|
const card = this.cardsRepo.create({
|
||||||
|
type_code: type.code,
|
||||||
|
id_placement: dto.id_placement,
|
||||||
|
id_absence: absenceId,
|
||||||
|
cree_par: userId,
|
||||||
|
operation,
|
||||||
|
statut: statutInitial,
|
||||||
|
payload: {
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif ?? null,
|
||||||
|
},
|
||||||
|
purge_at: this.purgeAt(type.retention_days, statutInitial),
|
||||||
|
});
|
||||||
|
const saved = await this.cardsRepo.save(card);
|
||||||
|
|
||||||
|
if (absenceId) {
|
||||||
|
await this.linkAbsenceCard(absenceId, saved.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.buildAudience(saved, type, placement, userId, role);
|
||||||
|
|
||||||
|
const full = await this.loadCard(saved.id);
|
||||||
|
const dtoOut = this.toDto(full, userId);
|
||||||
|
this.emitAudience(full, 'card.created', dtoOut);
|
||||||
|
return dtoOut;
|
||||||
|
}
|
||||||
|
|
||||||
|
async repondre(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
dto: RepondreCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
await this.assertInAudience(card, userId);
|
||||||
|
if (card.statut !== CardInstanceStatutType.OUVERTE) {
|
||||||
|
throw new BadRequestException('Cette carte n’est plus ouverte');
|
||||||
|
}
|
||||||
|
if (card.cree_par === userId) {
|
||||||
|
throw new ForbiddenException('Le créateur ne répond pas à sa propre carte');
|
||||||
|
}
|
||||||
|
|
||||||
|
const mode = card.type.response_mode;
|
||||||
|
if (mode === CardResponseModeType.NONE) {
|
||||||
|
throw new BadRequestException('Ce type de carte ne demande pas de réponse');
|
||||||
|
}
|
||||||
|
if (mode === CardResponseModeType.ACK && dto.action !== CardResponseActionType.ACK) {
|
||||||
|
throw new BadRequestException('Action attendue : ack');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
mode === CardResponseModeType.ACCEPT_REFUSE &&
|
||||||
|
dto.action !== CardResponseActionType.ACCEPT &&
|
||||||
|
dto.action !== CardResponseActionType.REFUSE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Action attendue : accept ou refuse');
|
||||||
|
}
|
||||||
|
if (dto.action === CardResponseActionType.REFUSE && !dto.comment?.trim()) {
|
||||||
|
throw new BadRequestException('Motivation obligatoire en cas de refus');
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.responsesRepo.save(
|
||||||
|
this.responsesRepo.create({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: userId,
|
||||||
|
action: dto.action,
|
||||||
|
comment: dto.comment?.trim(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (card.id_absence) {
|
||||||
|
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
statut: StatutAbsenceGardeType.ACCEPTE,
|
||||||
|
});
|
||||||
|
card.statut = CardInstanceStatutType.TRAITEE;
|
||||||
|
} else if (dto.action === CardResponseActionType.REFUSE) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
statut: StatutAbsenceGardeType.REFUSE,
|
||||||
|
motif: dto.comment!.trim(),
|
||||||
|
});
|
||||||
|
card.statut = CardInstanceStatutType.REFUSEE;
|
||||||
|
}
|
||||||
|
} else if (dto.action === CardResponseActionType.ACK) {
|
||||||
|
card.statut = CardInstanceStatutType.TRAITEE;
|
||||||
|
}
|
||||||
|
|
||||||
|
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||||
|
await this.cardsRepo.save(card);
|
||||||
|
const full = await this.loadCard(cardId);
|
||||||
|
const dtoOut = this.toDto(full, userId);
|
||||||
|
this.emitAudience(full, 'response.added', {
|
||||||
|
action: dto.action,
|
||||||
|
card: dtoOut,
|
||||||
|
});
|
||||||
|
this.emitAudience(full, 'card.updated', dtoOut);
|
||||||
|
return dtoOut;
|
||||||
|
}
|
||||||
|
|
||||||
|
async majEnAttente(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
dto: MajCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
if (card.cree_par !== userId) {
|
||||||
|
throw new ForbiddenException('Seul le créateur peut modifier cette carte');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
card.statut !== CardInstanceStatutType.OUVERTE &&
|
||||||
|
card.statut !== CardInstanceStatutType.REFUSEE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Carte non modifiable dans cet état');
|
||||||
|
}
|
||||||
|
|
||||||
|
const debut =
|
||||||
|
dto.date_debut ?? String(card.payload?.['date_debut'] ?? '');
|
||||||
|
const fin = dto.date_fin ?? String(card.payload?.['date_fin'] ?? '');
|
||||||
|
if (!debut || !fin || fin < debut) {
|
||||||
|
throw new BadRequestException('Dates invalides');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (card.id_absence) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
date_debut: debut,
|
||||||
|
date_fin: fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
card.payload = {
|
||||||
|
...card.payload,
|
||||||
|
date_debut: debut,
|
||||||
|
date_fin: fin,
|
||||||
|
motif: dto.motif ?? card.payload?.['motif'] ?? null,
|
||||||
|
};
|
||||||
|
card.statut = CardInstanceStatutType.OUVERTE;
|
||||||
|
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||||
|
await this.cardsRepo.save(card);
|
||||||
|
const full = await this.loadCard(cardId);
|
||||||
|
const dtoOut = this.toDto(full, userId);
|
||||||
|
this.emitAudience(full, 'card.updated', dtoOut);
|
||||||
|
return dtoOut;
|
||||||
|
}
|
||||||
|
|
||||||
|
async supprimer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
if (card.cree_par !== userId) {
|
||||||
|
throw new ForbiddenException('Seul le créateur peut supprimer cette carte');
|
||||||
|
}
|
||||||
|
const audienceIds = await this.audienceUserIds(card);
|
||||||
|
if (card.id_absence) {
|
||||||
|
const absStatut =
|
||||||
|
card.statut === CardInstanceStatutType.TRAITEE
|
||||||
|
? null
|
||||||
|
: card.id_absence;
|
||||||
|
// Supprime l’absence liée si pas encore acceptée définitivement
|
||||||
|
if (
|
||||||
|
card.statut === CardInstanceStatutType.OUVERTE ||
|
||||||
|
card.statut === CardInstanceStatutType.REFUSEE
|
||||||
|
) {
|
||||||
|
await this.absencesService.supprimer(userId, role, card.id_absence);
|
||||||
|
}
|
||||||
|
void absStatut;
|
||||||
|
}
|
||||||
|
await this.cardsRepo.delete({ id: cardId });
|
||||||
|
this.realtime.emitToUsers(audienceIds, 'card.deleted', cardId, {
|
||||||
|
id: cardId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private emitAudience(
|
||||||
|
card: CardInstance,
|
||||||
|
event: 'card.created' | 'card.updated' | 'response.added',
|
||||||
|
data: unknown,
|
||||||
|
): void {
|
||||||
|
const ids = (card.audience ?? []).map((a) => a.id_utilisateur);
|
||||||
|
if (ids.length === 0) return;
|
||||||
|
this.realtime.emitToUsers(ids, event, card.id, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async audienceUserIds(card: CardInstance): Promise<string[]> {
|
||||||
|
if (card.audience?.length) {
|
||||||
|
return card.audience.map((a) => a.id_utilisateur);
|
||||||
|
}
|
||||||
|
const rows = await this.audienceRepo.find({ where: { id_card: card.id } });
|
||||||
|
return rows.map((r) => r.id_utilisateur);
|
||||||
|
}
|
||||||
|
|
||||||
|
private mapAbsenceType(typeCode: string): TypeAbsenceGardeType {
|
||||||
|
if (typeCode === 'absence_enfant' || typeCode === 'absence_enfant_modif') {
|
||||||
|
return TypeAbsenceGardeType.ABSENCE_ENFANT;
|
||||||
|
}
|
||||||
|
if (typeCode === 'conge_am') return TypeAbsenceGardeType.CONGE_AM;
|
||||||
|
if (typeCode === 'arret_maladie_am') {
|
||||||
|
return TypeAbsenceGardeType.ARRET_MALADIE_AM;
|
||||||
|
}
|
||||||
|
throw new BadRequestException(`Type non mappé à une absence: ${typeCode}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async linkAbsenceCard(absenceId: string, cardId: string): Promise<void> {
|
||||||
|
// Update direct pour éviter droits maj vides
|
||||||
|
await this.cardsRepo.manager.query(
|
||||||
|
`UPDATE absences_garde SET id_card_instance = $1, modifie_le = now() WHERE id = $2`,
|
||||||
|
[cardId, absenceId],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async buildAudience(
|
||||||
|
card: CardInstance,
|
||||||
|
type: CardType,
|
||||||
|
placement: AmChildren,
|
||||||
|
creatorId: string,
|
||||||
|
creatorRole: RoleType,
|
||||||
|
): Promise<void> {
|
||||||
|
const members: Partial<CardAudienceMember>[] = [
|
||||||
|
{
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: creatorId,
|
||||||
|
role_snapshot: creatorRole,
|
||||||
|
is_creator: true,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
if (type.audience_resolver === 'couple_am') {
|
||||||
|
members.push({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: placement.amId,
|
||||||
|
role_snapshot: RoleType.ASSISTANTE_MATERNELLE,
|
||||||
|
is_creator: false,
|
||||||
|
});
|
||||||
|
} else if (type.audience_resolver === 'couple_parents') {
|
||||||
|
const liens = await this.parentsChildrenRepo.find({
|
||||||
|
where: { enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
for (const l of liens) {
|
||||||
|
if (l.parentId === creatorId) continue;
|
||||||
|
members.push({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: l.parentId,
|
||||||
|
role_snapshot: RoleType.PARENT,
|
||||||
|
is_creator: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// dédup
|
||||||
|
const seen = new Set<string>();
|
||||||
|
const unique = members.filter((m) => {
|
||||||
|
const k = m.id_utilisateur!;
|
||||||
|
if (seen.has(k)) return false;
|
||||||
|
seen.add(k);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
await this.audienceRepo.save(this.audienceRepo.create(unique));
|
||||||
|
}
|
||||||
|
|
||||||
|
private purgeAt(
|
||||||
|
retentionDays: number,
|
||||||
|
statut: CardInstanceStatutType,
|
||||||
|
): Date {
|
||||||
|
const days =
|
||||||
|
statut === CardInstanceStatutType.OUVERTE
|
||||||
|
? Math.max(retentionDays, 15)
|
||||||
|
: retentionDays;
|
||||||
|
return new Date(Date.now() + days * 24 * 60 * 60 * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async loadCard(id: string): Promise<CardInstance> {
|
||||||
|
const card = await this.cardsRepo.findOne({
|
||||||
|
where: { id },
|
||||||
|
relations: ['type', 'responses', 'audience'],
|
||||||
|
});
|
||||||
|
if (!card) throw new NotFoundException('Carte introuvable');
|
||||||
|
return card;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async assertInAudience(card: CardInstance, userId: string): Promise<void> {
|
||||||
|
const ok = (card.audience ?? []).some((a) => a.id_utilisateur === userId);
|
||||||
|
if (!ok) {
|
||||||
|
const row = await this.audienceRepo.findOne({
|
||||||
|
where: { id_card: card.id, id_utilisateur: userId },
|
||||||
|
});
|
||||||
|
if (!row) throw new ForbiddenException('Carte hors de votre audience');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async assertPlacementAccess(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
placementId: string,
|
||||||
|
): Promise<AmChildren> {
|
||||||
|
const placement = await this.amChildrenRepo.findOne({
|
||||||
|
where: { id: placementId, date_fin: IsNull() },
|
||||||
|
});
|
||||||
|
if (!placement) {
|
||||||
|
throw new NotFoundException('Placement introuvable ou inactif');
|
||||||
|
}
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
if (placement.amId !== userId) {
|
||||||
|
throw new ForbiddenException('Placement non autorisé');
|
||||||
|
}
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
const lien = await this.parentsChildrenRepo.findOne({
|
||||||
|
where: { parentId: userId, enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
if (!lien) throw new ForbiddenException('Placement non autorisé');
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException('Rôle non autorisé');
|
||||||
|
}
|
||||||
|
|
||||||
|
private toDto(card: CardInstance, userId: string): CarteDto {
|
||||||
|
const lastRefuse = [...(card.responses ?? [])]
|
||||||
|
.reverse()
|
||||||
|
.find((r) => r.action === CardResponseActionType.REFUSE);
|
||||||
|
return {
|
||||||
|
id: card.id,
|
||||||
|
type_code: card.type_code,
|
||||||
|
titre: card.type?.titre ?? card.type_code,
|
||||||
|
couleur: card.type?.couleur ?? null,
|
||||||
|
id_placement: card.id_placement,
|
||||||
|
id_absence: card.id_absence ?? null,
|
||||||
|
operation: card.operation,
|
||||||
|
statut: card.statut,
|
||||||
|
payload: card.payload ?? {},
|
||||||
|
purge_at: card.purge_at?.toISOString?.() ?? String(card.purge_at),
|
||||||
|
cree_par: card.cree_par ?? null,
|
||||||
|
is_creator: card.cree_par === userId,
|
||||||
|
response_mode: card.type?.response_mode,
|
||||||
|
last_refuse_comment: lastRefuse?.comment ?? null,
|
||||||
|
cree_le: card.cree_le?.toISOString?.() ?? String(card.cree_le),
|
||||||
|
modifie_le: card.modifie_le?.toISOString?.() ?? String(card.modifie_le),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
import {
|
||||||
|
IsDateString,
|
||||||
|
IsEnum,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
IsUUID,
|
||||||
|
MaxLength,
|
||||||
|
MinLength,
|
||||||
|
ValidateIf,
|
||||||
|
} from 'class-validator';
|
||||||
|
import { CardInstanceStatutType, CardOperationType } from 'src/entities/card_instances.entity';
|
||||||
|
import { CardResponseActionType } from 'src/entities/card_responses.entity';
|
||||||
|
|
||||||
|
export class CreerCarteDto {
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'absence_enfant | absence_enfant_modif | conge_am | arret_maladie_am',
|
||||||
|
})
|
||||||
|
@IsString()
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
@IsUUID()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2026-10-01' })
|
||||||
|
@IsDateString()
|
||||||
|
date_debut: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2026-10-05' })
|
||||||
|
@IsDateString()
|
||||||
|
date_fin: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(2000)
|
||||||
|
motif?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({
|
||||||
|
description: 'Requis pour operation=update (même id absences_garde)',
|
||||||
|
})
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
id_absence?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ enum: CardOperationType, default: CardOperationType.CREATE })
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(CardOperationType)
|
||||||
|
operation?: CardOperationType;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class RepondreCarteDto {
|
||||||
|
@ApiProperty({ enum: CardResponseActionType })
|
||||||
|
@IsEnum(CardResponseActionType)
|
||||||
|
action: CardResponseActionType;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ description: 'Obligatoire si action=refuse' })
|
||||||
|
@ValidateIf((o) => o.action === CardResponseActionType.REFUSE)
|
||||||
|
@IsString()
|
||||||
|
@MinLength(1)
|
||||||
|
@MaxLength(2000)
|
||||||
|
comment?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class MajCarteDto {
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_debut?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_fin?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(2000)
|
||||||
|
motif?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CarteDto {
|
||||||
|
@ApiProperty()
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
titre: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
couleur?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
id_absence?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: CardOperationType })
|
||||||
|
operation: CardOperationType;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: CardInstanceStatutType })
|
||||||
|
statut: CardInstanceStatutType;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
payload: Record<string, unknown>;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
purge_at: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
cree_par?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
is_creator: boolean;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
response_mode?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
last_refuse_comment?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
cree_le: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
modifie_le: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ListeCartesDto {
|
||||||
|
@ApiProperty({ type: [CarteDto] })
|
||||||
|
items: CarteDto[];
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export { CardsModule } from './cards.module';
|
||||||
|
export { CardsService } from './cards.service';
|
||||||
|
export { CardsRealtimeService } from './cards-realtime.service';
|
||||||
@@ -10,7 +10,10 @@ describe('AssistantesMaternellesController', () => {
|
|||||||
const authServiceMock = {
|
const authServiceMock = {
|
||||||
createAmDossierStaff: jest.fn(),
|
createAmDossierStaff: jest.fn(),
|
||||||
};
|
};
|
||||||
const amServiceMock = {};
|
const amServiceMock = {
|
||||||
|
listerCouplesGarde: jest.fn(),
|
||||||
|
definirCoupleGardeCourant: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
@@ -66,4 +69,29 @@ describe('AssistantesMaternellesController', () => {
|
|||||||
);
|
);
|
||||||
expect(res.numero_dossier).toBe('2026-000001');
|
expect(res.numero_dossier).toBe('2026-000001');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('listerCouplesGarde délègue au service (#171)', async () => {
|
||||||
|
amServiceMock.listerCouplesGarde.mockResolvedValue({
|
||||||
|
couples: [],
|
||||||
|
couple_courant_id: null,
|
||||||
|
});
|
||||||
|
const res = await controller.listerCouplesGarde('am-uuid');
|
||||||
|
expect(amServiceMock.listerCouplesGarde).toHaveBeenCalledWith('am-uuid');
|
||||||
|
expect(res.couple_courant_id).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('definirCoupleGardeCourant délègue au service (#171)', async () => {
|
||||||
|
amServiceMock.definirCoupleGardeCourant.mockResolvedValue({
|
||||||
|
couples: [{ id: 'pl-1', courant: true }],
|
||||||
|
couple_courant_id: 'pl-1',
|
||||||
|
});
|
||||||
|
const res = await controller.definirCoupleGardeCourant('am-uuid', {
|
||||||
|
couple_id: 'pl-1',
|
||||||
|
});
|
||||||
|
expect(amServiceMock.definirCoupleGardeCourant).toHaveBeenCalledWith(
|
||||||
|
'am-uuid',
|
||||||
|
'pl-1',
|
||||||
|
);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-1');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {
|
|||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
Post,
|
Post,
|
||||||
|
Put,
|
||||||
Body,
|
Body,
|
||||||
Patch,
|
Patch,
|
||||||
Param,
|
Param,
|
||||||
@@ -20,6 +21,8 @@ import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
|||||||
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
||||||
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
|
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
|
||||||
import { StaffCreateAmDossierResponseDto } from './dto/staff-create-am-dossier-response.dto';
|
import { StaffCreateAmDossierResponseDto } from './dto/staff-create-am-dossier-response.dto';
|
||||||
|
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
|
||||||
|
import { DefinirCoupleGardeCourantAmDto } from './dto/definir-couple-garde-courant-am.dto';
|
||||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
import { User } from 'src/common/decorators/user.decorator';
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
@@ -83,6 +86,36 @@ export class AssistantesMaternellesController {
|
|||||||
return mapAmsForApi(ams);
|
return mapAmsForApi(ams);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('me/couples-garde')
|
||||||
|
@Roles(RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Couples de garde de l’AM connectée — ticket #171',
|
||||||
|
description:
|
||||||
|
'Placements actifs (enfant + parents) pour peupler le bandeau couple TdB AM, ' +
|
||||||
|
'avec indication du couple courant.',
|
||||||
|
})
|
||||||
|
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
|
||||||
|
listerCouplesGarde(
|
||||||
|
@User('id') userId: string,
|
||||||
|
): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
return this.assistantesMaternellesService.listerCouplesGarde(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put('me/couples-garde/courant')
|
||||||
|
@Roles(RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Définir le couple de garde courant (AM) — ticket #171' })
|
||||||
|
@ApiBody({ type: DefinirCoupleGardeCourantAmDto })
|
||||||
|
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
|
||||||
|
definirCoupleGardeCourant(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@Body() dto: DefinirCoupleGardeCourantAmDto,
|
||||||
|
): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
return this.assistantesMaternellesService.definirCoupleGardeCourant(
|
||||||
|
userId,
|
||||||
|
dto.couple_id,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@Roles(RoleType.SUPER_ADMIN, RoleType.GESTIONNAIRE, RoleType.ADMINISTRATEUR)
|
@Roles(RoleType.SUPER_ADMIN, RoleType.GESTIONNAIRE, RoleType.ADMINISTRATEUR)
|
||||||
@Get(':id')
|
@Get(':id')
|
||||||
@ApiParam({ name: 'id', description: "UUID de la nounou" })
|
@ApiParam({ name: 'id', description: "UUID de la nounou" })
|
||||||
|
|||||||
@@ -4,13 +4,21 @@ import { AssistantesMaternellesController } from './assistantes_maternelles.cont
|
|||||||
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { Children } from 'src/entities/children.entity';
|
import { Children } from 'src/entities/children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { Users } from 'src/entities/users.entity';
|
import { Users } from 'src/entities/users.entity';
|
||||||
import { AuthModule } from '../auth/auth.module';
|
import { AuthModule } from '../auth/auth.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [TypeOrmModule.forFeature([AssistanteMaternelle, AmChildren, Children, Users]),
|
imports: [
|
||||||
AuthModule
|
TypeOrmModule.forFeature([
|
||||||
|
AssistanteMaternelle,
|
||||||
|
AmChildren,
|
||||||
|
Children,
|
||||||
|
Users,
|
||||||
|
ParentsChildren,
|
||||||
|
]),
|
||||||
|
AuthModule,
|
||||||
],
|
],
|
||||||
controllers: [AssistantesMaternellesController],
|
controllers: [AssistantesMaternellesController],
|
||||||
providers: [AssistantesMaternellesService],
|
providers: [AssistantesMaternellesService],
|
||||||
@@ -19,4 +27,4 @@ import { AuthModule } from '../auth/auth.module';
|
|||||||
TypeOrmModule,
|
TypeOrmModule,
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AssistantesMaternellesModule { }
|
export class AssistantesMaternellesModule {}
|
||||||
|
|||||||
@@ -1,18 +1,150 @@
|
|||||||
|
import { NotFoundException } from '@nestjs/common';
|
||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
import { AssistantesMaternellesService } from './assistantes_maternelles.service';
|
import { AssistantesMaternellesService } from './assistantes_maternelles.service';
|
||||||
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
|
import { Users } from 'src/entities/users.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { Children } from 'src/entities/children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
|
||||||
describe('AssistantesMaternellesService', () => {
|
describe('AssistantesMaternellesService — couples de garde (#171)', () => {
|
||||||
let service: AssistantesMaternellesService;
|
let service: AssistantesMaternellesService;
|
||||||
|
|
||||||
beforeEach(async () => {
|
const amRepo = { findOne: jest.fn(), update: jest.fn() };
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const usersRepo = {};
|
||||||
providers: [AssistantesMaternellesService],
|
const amChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
}).compile();
|
const childrenRepo = {};
|
||||||
|
const parentsChildrenRepo = { find: jest.fn() };
|
||||||
|
|
||||||
service = module.get<AssistantesMaternellesService>(AssistantesMaternellesService);
|
beforeEach(async () => {
|
||||||
|
jest.clearAllMocks();
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
AssistantesMaternellesService,
|
||||||
|
{ provide: getRepositoryToken(AssistanteMaternelle), useValue: amRepo },
|
||||||
|
{ provide: getRepositoryToken(Users), useValue: usersRepo },
|
||||||
|
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||||
|
{ provide: getRepositoryToken(Children), useValue: childrenRepo },
|
||||||
|
{
|
||||||
|
provide: getRepositoryToken(ParentsChildren),
|
||||||
|
useValue: parentsChildrenRepo,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
service = module.get(AssistantesMaternellesService);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should be defined', () => {
|
it('should be defined', () => {
|
||||||
expect(service).toBeDefined();
|
expect(service).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('listerCouplesGarde', () => {
|
||||||
|
it('retourne vide si aucun placement', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({
|
||||||
|
user_id: 'am-1',
|
||||||
|
id_placement_garde_courant: null,
|
||||||
|
});
|
||||||
|
amChildrenRepo.find.mockResolvedValue([]);
|
||||||
|
const res = await service.listerCouplesGarde('am-1');
|
||||||
|
expect(res).toEqual({ couples: [], couple_courant_id: null });
|
||||||
|
expect(parentsChildrenRepo.find).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('mappe placements + parents et marque le courant', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({
|
||||||
|
user_id: 'am-1',
|
||||||
|
id_placement_garde_courant: 'pl-2',
|
||||||
|
});
|
||||||
|
amChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
id: 'pl-1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
child: { id: 'e1', first_name: 'Léa', last_name: 'M', photo_url: null },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'pl-2',
|
||||||
|
enfantId: 'e2',
|
||||||
|
child: { id: 'e2', first_name: 'Emma', last_name: 'M', photo_url: null },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
parentsChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
parentId: 'p1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
parentId: 'p2',
|
||||||
|
enfantId: 'e1',
|
||||||
|
parent: { user: { prenom: 'Thomas', nom: 'Martin', photo_url: null } },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
parentId: 'p1',
|
||||||
|
enfantId: 'e2',
|
||||||
|
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const res = await service.listerCouplesGarde('am-1');
|
||||||
|
expect(res.couples).toHaveLength(2);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-2');
|
||||||
|
expect(res.couples[1].courant).toBe(true);
|
||||||
|
expect(res.couples[0].parents).toHaveLength(2);
|
||||||
|
expect(res.couples[0].parents[0].prenom).toBe('Claire');
|
||||||
|
expect(res.couples[0].enfant.prenom).toBe('Léa');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('404 si AM inconnue', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue(null);
|
||||||
|
await expect(service.listerCouplesGarde('x')).rejects.toBeInstanceOf(
|
||||||
|
NotFoundException,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('definirCoupleGardeCourant', () => {
|
||||||
|
it('persiste si le placement appartient à l’AM', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({
|
||||||
|
user_id: 'am-1',
|
||||||
|
id_placement_garde_courant: null,
|
||||||
|
});
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
});
|
||||||
|
amRepo.update.mockResolvedValue({ affected: 1 });
|
||||||
|
amChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
id: 'pl-1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
child: { id: 'e1', first_name: 'Léa', last_name: null, photo_url: null },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
parentsChildrenRepo.find.mockResolvedValue([
|
||||||
|
{
|
||||||
|
parentId: 'p1',
|
||||||
|
enfantId: 'e1',
|
||||||
|
parent: { user: { prenom: 'Claire', nom: 'M', photo_url: null } },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const res = await service.definirCoupleGardeCourant('am-1', 'pl-1');
|
||||||
|
expect(amRepo.update).toHaveBeenCalledWith(
|
||||||
|
{ user_id: 'am-1' },
|
||||||
|
{ id_placement_garde_courant: 'pl-1' },
|
||||||
|
);
|
||||||
|
expect(res.couple_courant_id).toBe('pl-1');
|
||||||
|
expect(res.couples[0].courant).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('404 si placement d’une autre AM', async () => {
|
||||||
|
amRepo.findOne.mockResolvedValue({ user_id: 'am-1' });
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue(null);
|
||||||
|
await expect(
|
||||||
|
service.definirCoupleGardeCourant('am-1', 'pl-x'),
|
||||||
|
).rejects.toBeInstanceOf(NotFoundException);
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,14 +5,16 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { IsNull, Repository } from 'typeorm';
|
import { In, IsNull, Repository } from 'typeorm';
|
||||||
import { RoleType, Users } from 'src/entities/users.entity';
|
import { RoleType, Users } from 'src/entities/users.entity';
|
||||||
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { Children, StatutEnfantType } from 'src/entities/children.entity';
|
import { Children, StatutEnfantType } from 'src/entities/children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
import { CreateAssistanteDto } from '../user/dto/create_assistante.dto';
|
import { CreateAssistanteDto } from '../user/dto/create_assistante.dto';
|
||||||
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
||||||
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
||||||
|
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
|
||||||
import { validateNir } from 'src/common/utils/nir.util';
|
import { validateNir } from 'src/common/utils/nir.util';
|
||||||
|
|
||||||
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
|
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
|
||||||
@@ -28,6 +30,8 @@ export class AssistantesMaternellesService {
|
|||||||
private readonly amChildrenRepository: Repository<AmChildren>,
|
private readonly amChildrenRepository: Repository<AmChildren>,
|
||||||
@InjectRepository(Children)
|
@InjectRepository(Children)
|
||||||
private readonly childrenRepository: Repository<Children>,
|
private readonly childrenRepository: Repository<Children>,
|
||||||
|
@InjectRepository(ParentsChildren)
|
||||||
|
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
|
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
|
||||||
@@ -264,4 +268,107 @@ export class AssistantesMaternellesService {
|
|||||||
await this.assistantesMaternelleRepository.delete(id);
|
await this.assistantesMaternelleRepository.delete(id);
|
||||||
return { message: 'Assistante maternelle supprimée' };
|
return { message: 'Assistante maternelle supprimée' };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liste les couples de garde (enfant ↔ parents) de l’AM connectée — ticket #171.
|
||||||
|
* Un couple = un placement actif dans enfants_assistantes_maternelles pour cette AM.
|
||||||
|
*/
|
||||||
|
async listerCouplesGarde(amUserId: string): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
const am = await this.assistantesMaternelleRepository.findOne({
|
||||||
|
where: { user_id: amUserId },
|
||||||
|
});
|
||||||
|
if (!am) {
|
||||||
|
throw new NotFoundException('Assistante maternelle introuvable');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placements = await this.amChildrenRepository.find({
|
||||||
|
where: { amId: amUserId, date_fin: IsNull() },
|
||||||
|
relations: ['child'],
|
||||||
|
order: { date_debut: 'ASC' },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (placements.length === 0) {
|
||||||
|
return { couples: [], couple_courant_id: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
const enfantIds = placements.map((p) => p.enfantId);
|
||||||
|
const liens = await this.parentsChildrenRepository.find({
|
||||||
|
where: { enfantId: In(enfantIds) },
|
||||||
|
relations: ['parent', 'parent.user'],
|
||||||
|
});
|
||||||
|
const parentsByEnfant = new Map<
|
||||||
|
string,
|
||||||
|
{ id: string; prenom: string | null; nom: string | null; photo_url: string | null }[]
|
||||||
|
>();
|
||||||
|
for (const l of liens) {
|
||||||
|
const list = parentsByEnfant.get(l.enfantId) ?? [];
|
||||||
|
const u = l.parent?.user;
|
||||||
|
list.push({
|
||||||
|
id: l.parentId,
|
||||||
|
prenom: u?.prenom ?? null,
|
||||||
|
nom: u?.nom ?? null,
|
||||||
|
photo_url: u?.photo_url ?? null,
|
||||||
|
});
|
||||||
|
parentsByEnfant.set(l.enfantId, list);
|
||||||
|
}
|
||||||
|
|
||||||
|
let idCourant = am.id_placement_garde_courant ?? null;
|
||||||
|
const idsValides = new Set(placements.map((p) => p.id));
|
||||||
|
if (idCourant && !idsValides.has(idCourant)) {
|
||||||
|
idCourant = null;
|
||||||
|
await this.assistantesMaternelleRepository.update(
|
||||||
|
{ user_id: amUserId },
|
||||||
|
{ id_placement_garde_courant: () => 'NULL' },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!idCourant && placements.length === 1) {
|
||||||
|
idCourant = placements[0].id;
|
||||||
|
}
|
||||||
|
|
||||||
|
const couples = placements.map((p) => ({
|
||||||
|
id: p.id,
|
||||||
|
enfant: {
|
||||||
|
id: p.child.id,
|
||||||
|
prenom: p.child.first_name ?? null,
|
||||||
|
nom: p.child.last_name ?? null,
|
||||||
|
photo_url: p.child.photo_url ?? null,
|
||||||
|
},
|
||||||
|
parents: parentsByEnfant.get(p.enfantId) ?? [],
|
||||||
|
courant: idCourant != null && p.id === idCourant,
|
||||||
|
}));
|
||||||
|
|
||||||
|
return {
|
||||||
|
couples,
|
||||||
|
couple_courant_id: idCourant,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persiste le couple de garde actif pour l’AM — ticket #171.
|
||||||
|
*/
|
||||||
|
async definirCoupleGardeCourant(
|
||||||
|
amUserId: string,
|
||||||
|
coupleId: string,
|
||||||
|
): Promise<CouplesGardeAmResponseDto> {
|
||||||
|
const am = await this.assistantesMaternelleRepository.findOne({
|
||||||
|
where: { user_id: amUserId },
|
||||||
|
});
|
||||||
|
if (!am) {
|
||||||
|
throw new NotFoundException('Assistante maternelle introuvable');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placement = await this.amChildrenRepository.findOne({
|
||||||
|
where: { id: coupleId, amId: amUserId, date_fin: IsNull() },
|
||||||
|
});
|
||||||
|
if (!placement) {
|
||||||
|
throw new NotFoundException('Couple de garde introuvable ou inactif pour cette AM');
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.assistantesMaternelleRepository.update(
|
||||||
|
{ user_id: amUserId },
|
||||||
|
{ id_placement_garde_courant: coupleId },
|
||||||
|
);
|
||||||
|
|
||||||
|
return this.listerCouplesGarde(amUserId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
/** Identité minimale enfant — ticket #171 (miroir #168) */
|
||||||
|
export class CoupleGardeAmEnfantDto {
|
||||||
|
@ApiProperty({ format: 'uuid' })
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
prenom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
nom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
photo_url?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Identité minimale parent pour bandeau AM — ticket #171 */
|
||||||
|
export class CoupleGardeAmParentDto {
|
||||||
|
@ApiProperty({ format: 'uuid', description: 'UUID utilisateur du parent' })
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
prenom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
nom?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
photo_url?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Un couple côté AM = placement actif enfant ↔ foyer parents.
|
||||||
|
* `id` = enfants_assistantes_maternelles.id (même clé que #168).
|
||||||
|
*/
|
||||||
|
export class CoupleGardeAmDto {
|
||||||
|
@ApiProperty({
|
||||||
|
format: 'uuid',
|
||||||
|
description: 'Id du placement (enfants_assistantes_maternelles.id)',
|
||||||
|
})
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiProperty({ type: CoupleGardeAmEnfantDto })
|
||||||
|
enfant: CoupleGardeAmEnfantDto;
|
||||||
|
|
||||||
|
@ApiProperty({
|
||||||
|
type: [CoupleGardeAmParentDto],
|
||||||
|
description: 'Parents rattachés à l’enfant (0–2 typiquement)',
|
||||||
|
})
|
||||||
|
parents: CoupleGardeAmParentDto[];
|
||||||
|
|
||||||
|
@ApiProperty({ description: 'True si c’est le couple actuellement sélectionné' })
|
||||||
|
courant: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CouplesGardeAmResponseDto {
|
||||||
|
@ApiProperty({ type: [CoupleGardeAmDto] })
|
||||||
|
couples: CoupleGardeAmDto[];
|
||||||
|
|
||||||
|
@ApiPropertyOptional({
|
||||||
|
format: 'uuid',
|
||||||
|
nullable: true,
|
||||||
|
description: 'Id du couple courant (null si aucun)',
|
||||||
|
})
|
||||||
|
couple_courant_id: string | null;
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
import { IsNotEmpty, IsUUID } from 'class-validator';
|
||||||
|
|
||||||
|
/** Corps PUT couple de garde courant AM — ticket #171 */
|
||||||
|
export class DefinirCoupleGardeCourantAmDto {
|
||||||
|
@ApiProperty({
|
||||||
|
format: 'uuid',
|
||||||
|
description: 'Id du placement (enfants_assistantes_maternelles.id) à sélectionner',
|
||||||
|
})
|
||||||
|
@IsUUID()
|
||||||
|
@IsNotEmpty()
|
||||||
|
couple_id: string;
|
||||||
|
}
|
||||||
@@ -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)
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
|
|||||||
@@ -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.';
|
||||||
@@ -107,7 +107,7 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
|||||||
| BDD | Table `absences_garde` + drop `evenements` |
|
| BDD | Table `absences_garde` + 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)
|
||||||
|
|||||||
@@ -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 |
@@ -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'] ?? '',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,152 @@ 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 {
|
||||||
|
// TODO: Pour l'instant on utilise le service générique de test (CoupleGardeService.getCouplesGarde).
|
||||||
|
// Dans le futur, l'API pour l'AM (enfants_accueillis) fournira la vraie liste.
|
||||||
|
final res = await CoupleGardeService.getCouplesGarde();
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_couples = res.couples;
|
||||||
|
_selectedCoupleId = res.coupleCourant?.id;
|
||||||
|
_couplesLoading = false;
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_couplesError = e.toString().replaceFirst('Exception: ', '');
|
||||||
|
_couplesLoading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _selectCouple(CoupleGarde couple) async {
|
||||||
|
if (couple.id == _selectedCoupleId) return;
|
||||||
|
setState(() => _selectedCoupleId = couple.id);
|
||||||
|
try {
|
||||||
|
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_couples = res.couples;
|
||||||
|
_selectedCoupleId = res.coupleCourant?.id ?? couple.id;
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(
|
||||||
|
"Impossible de changer 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(),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import 'package:p_tits_pas/services/couple_garde_service.dart';
|
|||||||
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
|
import 'package:p_tits_pas/widgets/quotidien/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 enfant–nounou (#167).
|
||||||
@@ -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).',
|
||||||
|
|||||||
@@ -0,0 +1,192 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:p_tits_pas/models/absence_garde.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/absences_garde_service.dart';
|
||||||
|
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||||
|
|
||||||
|
class AgendaAbsencesStub extends StatefulWidget {
|
||||||
|
final String? placementId;
|
||||||
|
|
||||||
|
const AgendaAbsencesStub({super.key, this.placementId});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<AgendaAbsencesStub> createState() => _AgendaAbsencesStubState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AgendaAbsencesStubState extends State<AgendaAbsencesStub> {
|
||||||
|
List<AbsenceGarde> _absences = [];
|
||||||
|
bool _loading = true;
|
||||||
|
String? _error;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_loadAbsences();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(covariant AgendaAbsencesStub oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.placementId != widget.placementId) {
|
||||||
|
_loadAbsences();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _loadAbsences() async {
|
||||||
|
setState(() {
|
||||||
|
_loading = true;
|
||||||
|
_error = null;
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
final absences = await AbsencesGardeService.getAbsences(
|
||||||
|
placementId: widget.placementId,
|
||||||
|
);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_absences = absences;
|
||||||
|
_loading = false;
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_error = e.toString();
|
||||||
|
_loading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Container(
|
||||||
|
color: QuotidienTheme.ivory,
|
||||||
|
child: Center(
|
||||||
|
child: ConstrainedBox(
|
||||||
|
constraints: const BoxConstraints(maxWidth: 600),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
const Icon(
|
||||||
|
Icons.calendar_month_outlined,
|
||||||
|
size: 64,
|
||||||
|
color: QuotidienTheme.peach,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Text(
|
||||||
|
"Agenda (Stub) - Lignes d'absence",
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
|
||||||
|
color: QuotidienTheme.ink,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
Text(
|
||||||
|
'ID Placement courant: ${widget.placementId ?? 'Tous'}',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: const TextStyle(color: QuotidienTheme.muted),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Expanded(
|
||||||
|
child: _buildList(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildList() {
|
||||||
|
if (_loading) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
if (_error != null) {
|
||||||
|
return Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.error_outline, color: Colors.red, size: 48),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Text(_error!, style: const TextStyle(color: Colors.red)),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: _loadAbsences,
|
||||||
|
child: const Text('Réessayer'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (_absences.isEmpty) {
|
||||||
|
return const Center(
|
||||||
|
child: Text('Aucune absence ou congé trouvé.',
|
||||||
|
style: TextStyle(color: QuotidienTheme.muted)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return ListView.separated(
|
||||||
|
itemCount: _absences.length,
|
||||||
|
separatorBuilder: (_, __) => const Divider(),
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final abs = _absences[index];
|
||||||
|
return ListTile(
|
||||||
|
leading: _getIcon(abs.type),
|
||||||
|
title: Text('${abs.type} (${abs.statut})'),
|
||||||
|
subtitle: Text(
|
||||||
|
'Du ${abs.dateDebut} au ${abs.dateFin}\n'
|
||||||
|
'Enfant: ${abs.prenomEnfant ?? 'N/A'}, AM: ${abs.prenomAm ?? 'N/A'}',
|
||||||
|
),
|
||||||
|
trailing: IconButton(
|
||||||
|
icon: const Icon(Icons.delete_outline, color: Colors.red),
|
||||||
|
onPressed: () => _confirmDelete(abs),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Icon _getIcon(String type) {
|
||||||
|
switch (type) {
|
||||||
|
case 'absence_enfant':
|
||||||
|
return const Icon(Icons.child_care, color: QuotidienTheme.coral);
|
||||||
|
case 'conge_am':
|
||||||
|
return const Icon(Icons.beach_access, color: QuotidienTheme.turquoise);
|
||||||
|
case 'arret_maladie_am':
|
||||||
|
return const Icon(Icons.medical_services, color: QuotidienTheme.coral);
|
||||||
|
default:
|
||||||
|
return const Icon(Icons.event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _confirmDelete(AbsenceGarde abs) async {
|
||||||
|
final confirm = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Text('Supprimer ?'),
|
||||||
|
content: Text("Supprimer l'absence ${abs.type} du ${abs.dateDebut} ?"),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context, false),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context, true),
|
||||||
|
style: TextButton.styleFrom(foregroundColor: Colors.red),
|
||||||
|
child: const Text('Supprimer'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (confirm == true) {
|
||||||
|
try {
|
||||||
|
await AbsencesGardeService.supprimerAbsence(abs.id);
|
||||||
|
_loadAbsences();
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return;
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(content: Text('Erreur: $e')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:p_tits_pas/models/absence_garde.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||||
|
import 'package:p_tits_pas/services/api/tokenService.dart';
|
||||||
|
|
||||||
|
class AbsencesGardeService {
|
||||||
|
static Future<List<AbsenceGarde>> getAbsences({String? placementId}) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse(ApiConfig.baseUrl +
|
||||||
|
'/absences-garde' +
|
||||||
|
(placementId != null ? '?placementId=$placementId' : ''));
|
||||||
|
|
||||||
|
final res = await http.get(uri, headers: headers);
|
||||||
|
if (res.statusCode == 200) {
|
||||||
|
final json = jsonDecode(res.body);
|
||||||
|
final List items = json['items'] ?? [];
|
||||||
|
return items.map((e) => AbsenceGarde.fromJson(e)).toList();
|
||||||
|
} else {
|
||||||
|
throw Exception('Erreur de chargement des absences : ${res.statusCode}');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<AbsenceGarde> creerAbsence({
|
||||||
|
required String idPlacement,
|
||||||
|
required String type,
|
||||||
|
required String dateDebut,
|
||||||
|
required String dateFin,
|
||||||
|
String? motif,
|
||||||
|
}) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde');
|
||||||
|
final res = await http.post(
|
||||||
|
uri,
|
||||||
|
headers: headers,
|
||||||
|
body: jsonEncode({
|
||||||
|
'id_placement': idPlacement,
|
||||||
|
'type': type,
|
||||||
|
'date_debut': dateDebut,
|
||||||
|
'date_fin': dateFin,
|
||||||
|
if (motif != null) 'motif': motif,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
if (res.statusCode == 201) {
|
||||||
|
return AbsenceGarde.fromJson(jsonDecode(res.body));
|
||||||
|
} else {
|
||||||
|
throw Exception("Erreur de création d'absence : ${res.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<AbsenceGarde> modifierAbsence(
|
||||||
|
String id, {
|
||||||
|
String? dateDebut,
|
||||||
|
String? dateFin,
|
||||||
|
String? statut,
|
||||||
|
String? motif,
|
||||||
|
}) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||||
|
final Map<String, dynamic> body = {};
|
||||||
|
if (dateDebut != null) body['date_debut'] = dateDebut;
|
||||||
|
if (dateFin != null) body['date_fin'] = dateFin;
|
||||||
|
if (statut != null) body['statut'] = statut;
|
||||||
|
if (motif != null) body['motif'] = motif;
|
||||||
|
|
||||||
|
final res = await http.patch(
|
||||||
|
uri,
|
||||||
|
headers: headers,
|
||||||
|
body: jsonEncode(body),
|
||||||
|
);
|
||||||
|
if (res.statusCode == 200) {
|
||||||
|
return AbsenceGarde.fromJson(jsonDecode(res.body));
|
||||||
|
} else {
|
||||||
|
throw Exception("Erreur de modification d'absence : ${res.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<void> supprimerAbsence(String id) async {
|
||||||
|
final token = await TokenService.getToken();
|
||||||
|
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||||
|
|
||||||
|
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||||
|
final res = await http.delete(uri, headers: headers);
|
||||||
|
if (res.statusCode != 204) {
|
||||||
|
throw Exception("Erreur de suppression d'absence : ${res.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -96,7 +96,8 @@ class ApiConfig {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static Map<String, String> authHeaders(String token) => {
|
static Map<String, String> authHeaders(String token) => {
|
||||||
...headers,
|
'Content-Type': 'application/json',
|
||||||
|
'Accept': 'application/json',
|
||||||
'Authorization': 'Bearer $token',
|
'Authorization': 'Bearer $token',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -135,6 +135,16 @@ class _CoupleCard extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
// Parent mode: enfant | AM
|
||||||
|
// AM mode: enfant | parent(s)
|
||||||
|
final isParentMode = mode == CoupleBandeauMode.parent;
|
||||||
|
final fallbackRoleIcon = isParentMode ? Icons.volunteer_activism : Icons.person_outline;
|
||||||
|
final fallbackRoleName = isParentMode ? 'Nounou' : 'Parent';
|
||||||
|
|
||||||
|
// TODO: In AM mode, we should ideally display "parent1+parent2 empilés" or centered.
|
||||||
|
// For now, CoupleGarde only gives us `am` (which in AM mode might just represent one parent, or the system needs to feed both parents here).
|
||||||
|
// Assuming backend will populate `am` field with the parent data when called by AM.
|
||||||
|
|
||||||
return Container(
|
return Container(
|
||||||
height: 90,
|
height: 90,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
@@ -175,14 +185,8 @@ class _CoupleCard extends StatelessWidget {
|
|||||||
photoUrl: couple.am.photoUrl,
|
photoUrl: couple.am.photoUrl,
|
||||||
name: (couple.am.prenom != null && couple.am.prenom!.isNotEmpty)
|
name: (couple.am.prenom != null && couple.am.prenom!.isNotEmpty)
|
||||||
? couple.am.prenom!
|
? couple.am.prenom!
|
||||||
: couple.am.displayName(
|
: couple.am.displayName(fallback: fallbackRoleName),
|
||||||
fallback: mode == CoupleBandeauMode.parent
|
fallbackIcon: fallbackRoleIcon,
|
||||||
? 'Nounou'
|
|
||||||
: 'Parent',
|
|
||||||
),
|
|
||||||
fallbackIcon: mode == CoupleBandeauMode.parent
|
|
||||||
? Icons.volunteer_activism
|
|
||||||
: Icons.person_outline,
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
@@ -30,6 +30,21 @@ dev_dependencies:
|
|||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
flutter_lints: ^2.0.0
|
flutter_lints: ^2.0.0
|
||||||
|
flutter_launcher_icons: ^0.13.1
|
||||||
|
|
||||||
|
flutter_launcher_icons:
|
||||||
|
android: "launcher_icon"
|
||||||
|
ios: false
|
||||||
|
image_path: "assets/images/icon.png"
|
||||||
|
web:
|
||||||
|
generate: true
|
||||||
|
image_path: "assets/images/icon.png"
|
||||||
|
background_color: "#ffffff"
|
||||||
|
theme_color: "#ffffff"
|
||||||
|
windows:
|
||||||
|
generate: true
|
||||||
|
image_path: "assets/images/icon.png"
|
||||||
|
icon_size: 256
|
||||||
|
|
||||||
flutter:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 917 B After Width: | Height: | Size: 633 B |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 165 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 165 KiB |
@@ -3,19 +3,19 @@
|
|||||||
"short_name": "P'titsPas",
|
"short_name": "P'titsPas",
|
||||||
"start_url": ".",
|
"start_url": ".",
|
||||||
"display": "standalone",
|
"display": "standalone",
|
||||||
"background_color": "#FFFEF9",
|
"background_color": "#ffffff",
|
||||||
"theme_color": "#8AD0C8",
|
"theme_color": "#ffffff",
|
||||||
"description": "P'titsPas - Grandir pas à pas, sereinement",
|
"description": "P'titsPas - Grandir pas à pas, sereinement",
|
||||||
"orientation": "portrait-primary",
|
"orientation": "portrait-primary",
|
||||||
"prefer_related_applications": false,
|
"prefer_related_applications": false,
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "assets/images/icon.png",
|
"src": "icons/Icon-192.png",
|
||||||
"sizes": "192x192",
|
"sizes": "192x192",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "assets/images/icon.png",
|
"src": "icons/Icon-512.png",
|
||||||
"sizes": "512x512",
|
"sizes": "512x512",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
},
|
},
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 47 KiB |