Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da71803852 | ||
|
|
2380aa9826 | ||
|
|
c952113099 | ||
|
|
8204669ec9 | ||
|
|
76ab0f340a | ||
|
|
a0a5e15b04 | ||
|
|
823ea6cd22 | ||
|
|
dfac075a74 |
@@ -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 { AmChildren } from './am_children.entity';
|
||||
|
||||
@@ -37,22 +37,32 @@ export class AssistanteMaternelle {
|
||||
@Column({ name: 'ville_residence', length: 100, nullable: true })
|
||||
residence_city?: string;
|
||||
|
||||
@Column( { name: 'date_agrement', type: 'date', nullable: true })
|
||||
@Column({ name: 'date_agrement', type: 'date', nullable: true })
|
||||
agreement_date?: Date;
|
||||
|
||||
@Column( { name: 'annee_experience', type: 'smallint', nullable: true })
|
||||
@Column({ name: 'annee_experience', type: 'smallint', nullable: true })
|
||||
years_experience?: number;
|
||||
|
||||
@Column( { name: 'specialite', length: 100, nullable: true })
|
||||
@Column({ name: 'specialite', length: 100, nullable: true })
|
||||
specialty?: string;
|
||||
|
||||
@Column( { name: 'place_disponible', type: 'integer', nullable: true })
|
||||
@Column({ name: 'place_disponible', type: 'integer', nullable: true })
|
||||
places_available?: number;
|
||||
|
||||
/** Numéro de dossier (format AAAA-NNNNNN), même valeur que sur utilisateurs (ticket #103) */
|
||||
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
||||
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)
|
||||
amChildren: AmChildren[];
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,9 @@ 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: [
|
||||
@@ -32,8 +34,8 @@ import { CardsService } from './cards.service';
|
||||
inject: [ConfigService],
|
||||
}),
|
||||
],
|
||||
controllers: [CardsController],
|
||||
providers: [CardsService],
|
||||
exports: [CardsService],
|
||||
controllers: [CardsController, CardsRealtimeController],
|
||||
providers: [CardsService, CardsRealtimeService],
|
||||
exports: [CardsService, CardsRealtimeService],
|
||||
})
|
||||
export class CardsModule {}
|
||||
|
||||
@@ -2,6 +2,7 @@ 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 {
|
||||
@@ -32,6 +33,7 @@ describe('CardsService (#194)', () => {
|
||||
create: jest.fn((x) => x),
|
||||
save: jest.fn(),
|
||||
findOne: jest.fn(),
|
||||
find: jest.fn(),
|
||||
};
|
||||
const responsesRepo = {
|
||||
create: jest.fn((x) => x),
|
||||
@@ -44,6 +46,7 @@ describe('CardsService (#194)', () => {
|
||||
maj: jest.fn(),
|
||||
supprimer: jest.fn(),
|
||||
};
|
||||
const realtime = { emitToUsers: jest.fn() };
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
@@ -56,6 +59,7 @@ describe('CardsService (#194)', () => {
|
||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||
{ provide: getRepositoryToken(ParentsChildren), useValue: parentsChildrenRepo },
|
||||
{ provide: AbsencesGardeService, useValue: absencesService },
|
||||
{ provide: CardsRealtimeService, useValue: realtime },
|
||||
],
|
||||
}).compile();
|
||||
service = module.get(CardsService);
|
||||
@@ -112,7 +116,11 @@ describe('CardsService (#194)', () => {
|
||||
retention_days: 14,
|
||||
},
|
||||
responses: [],
|
||||
audience: [],
|
||||
audience: [
|
||||
{ id_utilisateur: 'am-1' },
|
||||
{ id_utilisateur: 'p-1' },
|
||||
{ id_utilisateur: 'p-2' },
|
||||
],
|
||||
});
|
||||
|
||||
const res = await service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
@@ -124,6 +132,12 @@ describe('CardsService (#194)', () => {
|
||||
|
||||
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);
|
||||
});
|
||||
|
||||
@@ -32,6 +32,7 @@ import {
|
||||
MajCarteDto,
|
||||
RepondreCarteDto,
|
||||
} from './dto/cards.dto';
|
||||
import { CardsRealtimeService } from './cards-realtime.service';
|
||||
|
||||
@Injectable()
|
||||
export class CardsService {
|
||||
@@ -49,6 +50,7 @@ export class CardsService {
|
||||
@InjectRepository(ParentsChildren)
|
||||
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||
private readonly absencesService: AbsencesGardeService,
|
||||
private readonly realtime: CardsRealtimeService,
|
||||
) {}
|
||||
|
||||
async listerTypes(role: RoleType): Promise<CardType[]> {
|
||||
@@ -164,7 +166,9 @@ export class CardsService {
|
||||
await this.buildAudience(saved, type, placement, userId, role);
|
||||
|
||||
const full = await this.loadCard(saved.id);
|
||||
return this.toDto(full, userId);
|
||||
const dtoOut = this.toDto(full, userId);
|
||||
this.emitAudience(full, 'card.created', dtoOut);
|
||||
return dtoOut;
|
||||
}
|
||||
|
||||
async repondre(
|
||||
@@ -228,7 +232,14 @@ export class CardsService {
|
||||
|
||||
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||
await this.cardsRepo.save(card);
|
||||
return this.toDto(await this.loadCard(cardId), userId);
|
||||
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(
|
||||
@@ -273,7 +284,10 @@ export class CardsService {
|
||||
card.statut = CardInstanceStatutType.OUVERTE;
|
||||
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||
await this.cardsRepo.save(card);
|
||||
return this.toDto(await this.loadCard(cardId), userId);
|
||||
const full = await this.loadCard(cardId);
|
||||
const dtoOut = this.toDto(full, userId);
|
||||
this.emitAudience(full, 'card.updated', dtoOut);
|
||||
return dtoOut;
|
||||
}
|
||||
|
||||
async supprimer(
|
||||
@@ -285,6 +299,7 @@ export class CardsService {
|
||||
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
|
||||
@@ -300,6 +315,27 @@ export class CardsService {
|
||||
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 {
|
||||
|
||||
@@ -1,2 +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 = {
|
||||
createAmDossierStaff: jest.fn(),
|
||||
};
|
||||
const amServiceMock = {};
|
||||
const amServiceMock = {
|
||||
listerCouplesGarde: jest.fn(),
|
||||
definirCoupleGardeCourant: jest.fn(),
|
||||
};
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
@@ -66,4 +69,29 @@ describe('AssistantesMaternellesController', () => {
|
||||
);
|
||||
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,
|
||||
Get,
|
||||
Post,
|
||||
Put,
|
||||
Body,
|
||||
Patch,
|
||||
Param,
|
||||
@@ -20,6 +21,8 @@ import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
||||
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
||||
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.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 { AuthGuard } from 'src/common/guards/auth.guard';
|
||||
import { User } from 'src/common/decorators/user.decorator';
|
||||
@@ -83,6 +86,36 @@ export class AssistantesMaternellesController {
|
||||
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)
|
||||
@Get(':id')
|
||||
@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 { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { Children } from 'src/entities/children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { Users } from 'src/entities/users.entity';
|
||||
import { AuthModule } from '../auth/auth.module';
|
||||
|
||||
@Module({
|
||||
imports: [TypeOrmModule.forFeature([AssistanteMaternelle, AmChildren, Children, Users]),
|
||||
AuthModule
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([
|
||||
AssistanteMaternelle,
|
||||
AmChildren,
|
||||
Children,
|
||||
Users,
|
||||
ParentsChildren,
|
||||
]),
|
||||
AuthModule,
|
||||
],
|
||||
controllers: [AssistantesMaternellesController],
|
||||
providers: [AssistantesMaternellesService],
|
||||
@@ -19,4 +27,4 @@ import { AuthModule } from '../auth/auth.module';
|
||||
TypeOrmModule,
|
||||
],
|
||||
})
|
||||
export class AssistantesMaternellesModule { }
|
||||
export class AssistantesMaternellesModule {}
|
||||
|
||||
@@ -1,18 +1,150 @@
|
||||
import { NotFoundException } from '@nestjs/common';
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||
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;
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [AssistantesMaternellesService],
|
||||
}).compile();
|
||||
const amRepo = { findOne: jest.fn(), update: jest.fn() };
|
||||
const usersRepo = {};
|
||||
const amChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||
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', () => {
|
||||
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,
|
||||
} from '@nestjs/common';
|
||||
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 { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||
import { AmChildren } from 'src/entities/am_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 { UpdateAssistanteDto } from '../user/dto/update_assistante.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';
|
||||
|
||||
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
|
||||
@@ -28,6 +30,8 @@ export class AssistantesMaternellesService {
|
||||
private readonly amChildrenRepository: Repository<AmChildren>,
|
||||
@InjectRepository(Children)
|
||||
private readonly childrenRepository: Repository<Children>,
|
||||
@InjectRepository(ParentsChildren)
|
||||
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
||||
) {}
|
||||
|
||||
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
|
||||
@@ -264,4 +268,107 @@ export class AssistantesMaternellesService {
|
||||
await this.assistantesMaternelleRepository.delete(id);
|
||||
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,
|
||||
specialite VARCHAR(100),
|
||||
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
|
||||
@@ -221,6 +224,16 @@ CREATE INDEX idx_parents_placement_garde_courant
|
||||
ON parents(id_placement_garde_courant)
|
||||
WHERE id_placement_garde_courant IS NOT NULL;
|
||||
|
||||
-- FK couple courant AM → placement (#171)
|
||||
ALTER TABLE assistantes_maternelles
|
||||
ADD CONSTRAINT fk_am_placement_garde_courant
|
||||
FOREIGN KEY (id_placement_garde_courant)
|
||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
|
||||
|
||||
CREATE INDEX idx_am_placement_garde_courant
|
||||
ON assistantes_maternelles(id_placement_garde_courant)
|
||||
WHERE id_placement_garde_courant IS NOT NULL;
|
||||
|
||||
-- ==========================================================
|
||||
-- Table : dossier_famille (inscription parent — ticket #119)
|
||||
-- ==========================================================
|
||||
|
||||
@@ -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;
|
||||
@@ -107,7 +107,7 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
||||
| BDD | Table `absences_garde` + drop `evenements` |
|
||||
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
||||
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
||||
| Realtime | WS/SSE bulles |
|
||||
| Realtime | WS/SSE bulles → **SSE** `GET /cards/stream` (#195) |
|
||||
| Purge TTL | Job `expire_at` / `purge_at` |
|
||||
|
||||
### Front (après API — hors chantier back immédiat)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<application
|
||||
android:label="p_tits_pas"
|
||||
android:name="${applicationName}"
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
android:icon="@mipmap/launcher_icon">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
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'] ?? '',
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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/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';
|
||||
|
||||
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
|
||||
/// 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).',
|
||||
icon: Icons.chat_bubble_outline,
|
||||
),
|
||||
agendaBody: const QuotidienStubPage(
|
||||
title: 'Agenda',
|
||||
message: 'Agenda — contenu à venir (stub #187).',
|
||||
),
|
||||
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
|
||||
contratBody: const QuotidienStubPage(
|
||||
title: 'Contrat',
|
||||
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) => {
|
||||
...headers,
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json',
|
||||
'Authorization': 'Bearer $token',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -383,6 +383,13 @@ class AuthService {
|
||||
}
|
||||
|
||||
/// 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 {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final userJson = prefs.getString(_currentUserKey);
|
||||
|
||||
@@ -6,6 +6,7 @@ abstract final class QuotidienTheme {
|
||||
static const Color ink = Color(0xFF2F2F2F);
|
||||
static const Color ivory = Color(0xFFFFFEF9);
|
||||
static const Color turquoise = Color(0xFF8AD0C8);
|
||||
static const Color peach = Color(0xFFFFCCB6);
|
||||
static const Color lavender = Color(0xFFC6A3D8);
|
||||
static const Color coral = Color(0xFFF4A28C);
|
||||
static const Color softGreenPill = Color(0xFFB8D9A8);
|
||||
|
||||
@@ -1,6 +1,22 @@
|
||||
# Generated by pub
|
||||
# See https://dart.dev/tools/pub/glossary#lockfile
|
||||
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:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -25,6 +41,22 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
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:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -150,6 +182,14 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
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:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@@ -213,6 +253,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.2"
|
||||
image:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image
|
||||
sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.10.1"
|
||||
image_picker:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -293,6 +341,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
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:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -461,6 +517,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.8"
|
||||
posix:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: posix
|
||||
sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.5.2"
|
||||
provider:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -722,6 +786,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.0"
|
||||
yaml:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: yaml
|
||||
sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.4"
|
||||
sdks:
|
||||
dart: ">=3.7.0-0 <4.0.0"
|
||||
flutter: ">=3.19.0"
|
||||
|
||||
@@ -30,6 +30,21 @@ dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
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:
|
||||
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",
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"background_color": "#FFFEF9",
|
||||
"theme_color": "#8AD0C8",
|
||||
"background_color": "#ffffff",
|
||||
"theme_color": "#ffffff",
|
||||
"description": "P'titsPas - Grandir pas à pas, sereinement",
|
||||
"orientation": "portrait-primary",
|
||||
"prefer_related_applications": false,
|
||||
"icons": [
|
||||
{
|
||||
"src": "assets/images/icon.png",
|
||||
"src": "icons/Icon-192.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "assets/images/icon.png",
|
||||
"src": "icons/Icon-512.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png"
|
||||
},
|
||||
|
||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 47 KiB |