Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d42927297d | ||
|
|
1d3ec0b759 | ||
|
|
608e62d662 | ||
|
|
dc491470db | ||
|
|
5a73da898b | ||
|
|
0c736f5605 | ||
|
|
6c8ef32a11 | ||
|
|
f3b2da4b4d | ||
|
|
edab253296 | ||
|
|
d61e34a1e6 | ||
|
|
484fb9a3e5 | ||
|
|
72982f792b | ||
|
|
32f6eeeeed | ||
|
|
8b1c4555ad | ||
|
|
f978e65dfd | ||
|
|
6683139429 | ||
|
|
da12418aa0 | ||
|
|
8c778d1a6d | ||
|
|
1d68f86b3e | ||
|
|
2a24c0a061 | ||
|
|
07d3160bff | ||
|
|
bace0edd96 | ||
|
|
e267cdf8bc | ||
|
|
9c021c56b3 | ||
|
|
c922421919 | ||
|
|
e91468616b | ||
|
|
1f985f5b37 | ||
|
|
7705a14bb5 | ||
|
|
535af3b146 | ||
|
|
2832499d3e | ||
|
|
676e22665a | ||
|
|
5eb0f13e75 | ||
|
|
2c461abc82 | ||
|
|
42163826fe | ||
|
|
7ff169d4c9 | ||
|
|
ebf77b1ebb | ||
|
|
d53682110d | ||
|
|
290d442123 | ||
|
|
2114748d44 |
@@ -16,7 +16,7 @@ import { AllExceptionsFilter } from './common/filters/all_exceptions.filters';
|
||||
import { EnfantsModule } from './routes/enfants/enfants.module';
|
||||
import { AppConfigModule } from './modules/config/config.module';
|
||||
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
||||
import { AbsencesGardeModule } from './modules/absences-garde';
|
||||
import { EvenementsAgendaModule } from './modules/evenements-agenda';
|
||||
import { CardsModule } from './modules/cards';
|
||||
import { RelaisModule } from './routes/relais/relais.module';
|
||||
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
||||
@@ -58,7 +58,7 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||
AuthModule,
|
||||
AppConfigModule,
|
||||
DocumentsLegauxModule,
|
||||
AbsencesGardeModule,
|
||||
EvenementsAgendaModule,
|
||||
CardsModule,
|
||||
RelaisModule,
|
||||
DossiersModule,
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
UpdateDateColumn,
|
||||
} from 'typeorm';
|
||||
import { AmChildren } from './am_children.entity';
|
||||
import { AbsencesGarde } from './absences_garde.entity';
|
||||
import { EvenementsAgenda } from './evenements_agenda.entity';
|
||||
import { Users } from './users.entity';
|
||||
import { CardType } from './card_types.entity';
|
||||
import { CardAudienceMember } from './card_audience_members.entity';
|
||||
@@ -45,12 +45,12 @@ export class CardInstance {
|
||||
@JoinColumn({ name: 'id_placement', referencedColumnName: 'id' })
|
||||
placement: AmChildren;
|
||||
|
||||
@Column({ name: 'id_absence', type: 'uuid', nullable: true })
|
||||
id_absence?: string;
|
||||
@Column({ name: 'id_evenement', type: 'uuid', nullable: true })
|
||||
id_evenement?: string;
|
||||
|
||||
@ManyToOne(() => AbsencesGarde, { nullable: true, onDelete: 'SET NULL' })
|
||||
@JoinColumn({ name: 'id_absence', referencedColumnName: 'id' })
|
||||
absence?: AbsencesGarde;
|
||||
@ManyToOne(() => EvenementsAgenda, { nullable: true, onDelete: 'SET NULL' })
|
||||
@JoinColumn({ name: 'id_evenement', referencedColumnName: 'id' })
|
||||
evenement?: EvenementsAgenda;
|
||||
|
||||
@Column({ name: 'cree_par', type: 'uuid', nullable: true })
|
||||
cree_par?: string;
|
||||
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
JoinColumn,
|
||||
ManyToOne,
|
||||
PrimaryGeneratedColumn,
|
||||
RelationId,
|
||||
} from 'typeorm';
|
||||
import { CardInstance } from './card_instances.entity';
|
||||
import { Users } from './users.entity';
|
||||
@@ -20,20 +21,21 @@ export class CardResponse {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ name: 'id_card', type: 'uuid' })
|
||||
id_card: string;
|
||||
|
||||
/** FK carte — une seule source de vérité via @JoinColumn (pas de @Column doublon). */
|
||||
@ManyToOne(() => CardInstance, (c) => c.responses, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'id_card', referencedColumnName: 'id' })
|
||||
card: CardInstance;
|
||||
|
||||
@Column({ name: 'id_utilisateur', type: 'uuid' })
|
||||
id_utilisateur: string;
|
||||
@RelationId((r: CardResponse) => r.card)
|
||||
id_card: string;
|
||||
|
||||
@ManyToOne(() => Users, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'id_utilisateur', referencedColumnName: 'id' })
|
||||
user: Users;
|
||||
|
||||
@RelationId((r: CardResponse) => r.user)
|
||||
id_utilisateur: string;
|
||||
|
||||
@Column({
|
||||
type: 'enum',
|
||||
enum: CardResponseActionType,
|
||||
|
||||
@@ -10,25 +10,25 @@ import {
|
||||
import { AmChildren } from './am_children.entity';
|
||||
import { Users } from './users.entity';
|
||||
|
||||
export enum TypeAbsenceGardeType {
|
||||
export enum TypeEvenementAgendaType {
|
||||
ABSENCE_ENFANT = 'absence_enfant',
|
||||
CONGE_AM = 'conge_am',
|
||||
ARRET_MALADIE_AM = 'arret_maladie_am',
|
||||
}
|
||||
|
||||
export enum StatutAbsenceGardeType {
|
||||
export enum StatutEvenementAgendaType {
|
||||
EN_ATTENTE = 'en_attente',
|
||||
ACCEPTE = 'accepte',
|
||||
REFUSE = 'refuse',
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérité métier des absences / congés / arrêts par couple AM↔enfant.
|
||||
* Les cartes (module ultérieur) collectent ; cette table stocke.
|
||||
* Ticket #193.
|
||||
* Vérité métier agenda par couple AM↔enfant (placement).
|
||||
* Types V1 : absences / congés / arrêts ; extensible (soins, école, mairie…).
|
||||
* Les cartes collectent ; cette table historise. Ticket #205.
|
||||
*/
|
||||
@Entity('absences_garde', { schema: 'public' })
|
||||
export class AbsencesGarde {
|
||||
@Entity('evenements_agenda', { schema: 'public' })
|
||||
export class EvenementsAgenda {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@@ -41,11 +41,11 @@ export class AbsencesGarde {
|
||||
|
||||
@Column({
|
||||
type: 'enum',
|
||||
enum: TypeAbsenceGardeType,
|
||||
enumName: 'type_absence_garde_type',
|
||||
enum: TypeEvenementAgendaType,
|
||||
enumName: 'type_evenement_agenda_type',
|
||||
name: 'type',
|
||||
})
|
||||
type: TypeAbsenceGardeType;
|
||||
type: TypeEvenementAgendaType;
|
||||
|
||||
@Column({ name: 'date_debut', type: 'date' })
|
||||
date_debut: string;
|
||||
@@ -55,12 +55,12 @@ export class AbsencesGarde {
|
||||
|
||||
@Column({
|
||||
type: 'enum',
|
||||
enum: StatutAbsenceGardeType,
|
||||
enumName: 'statut_absence_garde_type',
|
||||
enum: StatutEvenementAgendaType,
|
||||
enumName: 'statut_evenement_agenda_type',
|
||||
name: 'statut',
|
||||
default: StatutAbsenceGardeType.EN_ATTENTE,
|
||||
default: StatutEvenementAgendaType.EN_ATTENTE,
|
||||
})
|
||||
statut: StatutAbsenceGardeType;
|
||||
statut: StatutEvenementAgendaType;
|
||||
|
||||
/** Purge auto pour en_attente/refuse ; accepte → infinity. */
|
||||
@Column({ name: 'expire_at', type: 'timestamptz' })
|
||||
@@ -1,2 +0,0 @@
|
||||
export { AbsencesGardeModule } from './absences-garde.module';
|
||||
export { AbsencesGardeService } from './absences-garde.service';
|
||||
@@ -65,7 +65,7 @@ export class CardsController {
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@HttpCode(HttpStatus.CREATED)
|
||||
@ApiOperation({
|
||||
summary: 'Créer une bulle (+ hook absences_garde) — #194',
|
||||
summary: 'Créer une bulle (+ hook evenements_agenda) — #194',
|
||||
})
|
||||
@ApiBody({ type: CreerCarteDto })
|
||||
@ApiResponse({ status: 201, type: CarteDto })
|
||||
|
||||
@@ -2,7 +2,7 @@ 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 { EvenementsAgendaModule } from '../evenements-agenda';
|
||||
import { CardType } from 'src/entities/card_types.entity';
|
||||
import { CardInstance } from 'src/entities/card_instances.entity';
|
||||
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||
@@ -16,7 +16,7 @@ import { CardsRealtimeService } from './cards-realtime.service';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
AbsencesGardeModule,
|
||||
EvenementsAgendaModule,
|
||||
TypeOrmModule.forFeature([
|
||||
CardType,
|
||||
CardInstance,
|
||||
|
||||
@@ -3,7 +3,7 @@ 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 { EvenementsAgendaService } from '../evenements-agenda/evenements-agenda.service';
|
||||
import { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||
import {
|
||||
CardInstance,
|
||||
@@ -15,7 +15,7 @@ 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';
|
||||
import { StatutEvenementAgendaType, TypeEvenementAgendaType } from 'src/entities/evenements_agenda.entity';
|
||||
|
||||
describe('CardsService (#194)', () => {
|
||||
let service: CardsService;
|
||||
@@ -24,6 +24,7 @@ describe('CardsService (#194)', () => {
|
||||
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() })),
|
||||
update: jest.fn(async () => ({ affected: 1 })),
|
||||
findOne: jest.fn(),
|
||||
delete: jest.fn(),
|
||||
createQueryBuilder: jest.fn(),
|
||||
@@ -37,11 +38,12 @@ describe('CardsService (#194)', () => {
|
||||
};
|
||||
const responsesRepo = {
|
||||
create: jest.fn((x) => x),
|
||||
save: jest.fn(),
|
||||
save: jest.fn(async (x) => x),
|
||||
insert: jest.fn(),
|
||||
};
|
||||
const amChildrenRepo = { findOne: jest.fn() };
|
||||
const parentsChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||
const absencesService = {
|
||||
const evenementsService = {
|
||||
creer: jest.fn(),
|
||||
maj: jest.fn(),
|
||||
supprimer: jest.fn(),
|
||||
@@ -58,7 +60,7 @@ describe('CardsService (#194)', () => {
|
||||
{ provide: getRepositoryToken(CardResponse), useValue: responsesRepo },
|
||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||
{ provide: getRepositoryToken(ParentsChildren), useValue: parentsChildrenRepo },
|
||||
{ provide: AbsencesGardeService, useValue: absencesService },
|
||||
{ provide: EvenementsAgendaService, useValue: evenementsService },
|
||||
{ provide: CardsRealtimeService, useValue: realtime },
|
||||
],
|
||||
}).compile();
|
||||
@@ -80,7 +82,6 @@ describe('CardsService (#194)', () => {
|
||||
audience_resolver: 'couple_parents',
|
||||
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||
retention_days: 14,
|
||||
couleur: 'lavender',
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
@@ -88,10 +89,10 @@ describe('CardsService (#194)', () => {
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
absencesService.creer.mockResolvedValue({
|
||||
evenementsService.creer.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
type: TypeAbsenceGardeType.CONGE_AM,
|
||||
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||
type: TypeEvenementAgendaType.CONGE_AM,
|
||||
statut: StatutEvenementAgendaType.EN_ATTENTE,
|
||||
});
|
||||
parentsChildrenRepo.find.mockResolvedValue([
|
||||
{ parentId: 'p-1', enfantId: 'e-1' },
|
||||
@@ -101,7 +102,7 @@ describe('CardsService (#194)', () => {
|
||||
id: 'card-1',
|
||||
type_code: 'conge_am',
|
||||
id_placement: 'pl-1',
|
||||
id_absence: 'abs-1',
|
||||
id_evenement: 'abs-1',
|
||||
cree_par: 'am-1',
|
||||
operation: CardOperationType.CREATE,
|
||||
statut: CardInstanceStatutType.OUVERTE,
|
||||
@@ -111,7 +112,6 @@ describe('CardsService (#194)', () => {
|
||||
modifie_le: new Date(),
|
||||
type: {
|
||||
titre: 'Congé AM',
|
||||
couleur: 'lavender',
|
||||
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||
retention_days: 14,
|
||||
},
|
||||
@@ -130,7 +130,7 @@ describe('CardsService (#194)', () => {
|
||||
date_fin: '2026-11-07',
|
||||
});
|
||||
|
||||
expect(absencesService.creer).toHaveBeenCalled();
|
||||
expect(evenementsService.creer).toHaveBeenCalled();
|
||||
expect(audienceRepo.save).toHaveBeenCalled();
|
||||
expect(realtime.emitToUsers).toHaveBeenCalledWith(
|
||||
['am-1', 'p-1', 'p-2'],
|
||||
@@ -157,4 +157,128 @@ describe('CardsService (#194)', () => {
|
||||
}),
|
||||
).rejects.toBeInstanceOf(ForbiddenException);
|
||||
});
|
||||
|
||||
it('parent crée absence_enfant → audience AM + co-parent', async () => {
|
||||
typesRepo.findOne.mockResolvedValue({
|
||||
code: 'absence_enfant',
|
||||
system: true,
|
||||
titre: 'Absence enfant',
|
||||
emitter_roles: [RoleType.PARENT],
|
||||
recipient_roles: [RoleType.ASSISTANTE_MATERNELLE],
|
||||
audience_resolver: 'couple_am',
|
||||
response_mode: CardResponseModeType.NONE,
|
||||
retention_days: 7,
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
parentsChildrenRepo.find.mockResolvedValue([
|
||||
{ parentId: 'p-1', enfantId: 'e-1' },
|
||||
{ parentId: 'p-2', enfantId: 'e-1' },
|
||||
]);
|
||||
evenementsService.creer.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
});
|
||||
cardsRepo.findOne.mockResolvedValue({
|
||||
id: 'card-abs',
|
||||
type_code: 'absence_enfant',
|
||||
id_placement: 'pl-1',
|
||||
id_evenement: 'abs-1',
|
||||
cree_par: 'p-1',
|
||||
operation: CardOperationType.CREATE,
|
||||
statut: CardInstanceStatutType.OUVERTE,
|
||||
payload: { date_debut: '2026-10-28', date_fin: '2026-10-29' },
|
||||
purge_at: new Date(),
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
type: {
|
||||
titre: 'Absence enfant',
|
||||
response_mode: CardResponseModeType.NONE,
|
||||
retention_days: 7,
|
||||
},
|
||||
responses: [],
|
||||
audience: [
|
||||
{ id_utilisateur: 'p-1' },
|
||||
{ id_utilisateur: 'am-1' },
|
||||
{ id_utilisateur: 'p-2' },
|
||||
],
|
||||
});
|
||||
|
||||
await service.creer('p-1', RoleType.PARENT, {
|
||||
type_code: 'absence_enfant',
|
||||
id_placement: 'pl-1',
|
||||
date_debut: '2026-10-28',
|
||||
date_fin: '2026-10-29',
|
||||
});
|
||||
|
||||
const saved = audienceRepo.save.mock.calls[0][0] as Array<{
|
||||
id_utilisateur: string;
|
||||
is_creator: boolean;
|
||||
}>;
|
||||
const ids = saved.map((m) => m.id_utilisateur).sort();
|
||||
expect(ids).toEqual(['am-1', 'p-1', 'p-2']);
|
||||
expect(saved.find((m) => m.id_utilisateur === 'p-2')?.is_creator).toBe(false);
|
||||
});
|
||||
|
||||
it('parent accepte conge_am → response via relation + carte traitee', async () => {
|
||||
cardsRepo.findOne.mockResolvedValue({
|
||||
id: 'card-1',
|
||||
type_code: 'conge_am',
|
||||
id_placement: 'pl-1',
|
||||
id_evenement: 'ev-1',
|
||||
cree_par: 'am-1',
|
||||
operation: CardOperationType.CREATE,
|
||||
statut: CardInstanceStatutType.OUVERTE,
|
||||
payload: { date_debut: '2026-10-27', date_fin: '2026-10-31' },
|
||||
purge_at: new Date(),
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
type: {
|
||||
titre: 'Congé AM',
|
||||
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||
retention_days: 14,
|
||||
},
|
||||
responses: [],
|
||||
audience: [
|
||||
{ id_utilisateur: 'am-1' },
|
||||
{ id_utilisateur: 'p-1' },
|
||||
{ id_utilisateur: 'p-2' },
|
||||
],
|
||||
});
|
||||
audienceRepo.findOne.mockResolvedValue({ id_card: 'card-1', id_utilisateur: 'p-1' });
|
||||
evenementsService.maj.mockResolvedValue({});
|
||||
|
||||
const res = await service.repondre('p-1', RoleType.PARENT, 'card-1', {
|
||||
action: 'accept' as never,
|
||||
});
|
||||
|
||||
expect(responsesRepo.create).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
card: { id: 'card-1' },
|
||||
user: { id: 'p-1' },
|
||||
action: 'accept',
|
||||
}),
|
||||
);
|
||||
expect(responsesRepo.save).toHaveBeenCalled();
|
||||
expect(evenementsService.maj).toHaveBeenCalledWith(
|
||||
'p-1',
|
||||
RoleType.PARENT,
|
||||
'ev-1',
|
||||
expect.objectContaining({ statut: StatutEvenementAgendaType.ACCEPTE }),
|
||||
);
|
||||
expect(cardsRepo.update).toHaveBeenCalledWith(
|
||||
{ id: 'card-1' },
|
||||
expect.objectContaining({ statut: CardInstanceStatutType.TRAITEE }),
|
||||
);
|
||||
expect(res.statut).toBe(CardInstanceStatutType.TRAITEE);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -6,11 +6,11 @@ import {
|
||||
} from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { IsNull, Repository } from 'typeorm';
|
||||
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||
import { EvenementsAgendaService } from '../evenements-agenda/evenements-agenda.service';
|
||||
import {
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
@@ -49,13 +49,36 @@ export class CardsService {
|
||||
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||
@InjectRepository(ParentsChildren)
|
||||
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||
private readonly absencesService: AbsencesGardeService,
|
||||
private readonly evenementsService: EvenementsAgendaService,
|
||||
private readonly realtime: CardsRealtimeService,
|
||||
) {}
|
||||
|
||||
async listerTypes(role: RoleType): Promise<CardType[]> {
|
||||
async listerTypes(role: RoleType): Promise<
|
||||
Pick<
|
||||
CardType,
|
||||
| 'code'
|
||||
| 'system'
|
||||
| 'titre'
|
||||
| 'emitter_roles'
|
||||
| 'recipient_roles'
|
||||
| 'audience_resolver'
|
||||
| 'response_mode'
|
||||
| 'retention_days'
|
||||
>[]
|
||||
> {
|
||||
const all = await this.typesRepo.find({ where: { system: true } });
|
||||
return all.filter((t) => t.emitter_roles.includes(role));
|
||||
return all
|
||||
.filter((t) => t.emitter_roles.includes(role))
|
||||
.map((t) => ({
|
||||
code: t.code,
|
||||
system: t.system,
|
||||
titre: t.titre,
|
||||
emitter_roles: t.emitter_roles,
|
||||
recipient_roles: t.recipient_roles,
|
||||
audience_resolver: t.audience_resolver,
|
||||
response_mode: t.response_mode,
|
||||
retention_days: t.retention_days,
|
||||
}));
|
||||
}
|
||||
|
||||
async lister(
|
||||
@@ -110,11 +133,11 @@ export class CardsService {
|
||||
);
|
||||
const operation = dto.operation ?? CardOperationType.CREATE;
|
||||
|
||||
let absenceId = dto.id_absence;
|
||||
let absenceId = dto.id_evenement;
|
||||
const absenceType = this.mapAbsenceType(dto.type_code);
|
||||
|
||||
if (operation === CardOperationType.CREATE) {
|
||||
const absence = await this.absencesService.creer(userId, role, {
|
||||
const absence = await this.evenementsService.creer(userId, role, {
|
||||
id_placement: dto.id_placement,
|
||||
type: absenceType,
|
||||
date_debut: dto.date_debut,
|
||||
@@ -124,16 +147,16 @@ export class CardsService {
|
||||
absenceId = absence.id;
|
||||
} else {
|
||||
if (!absenceId) {
|
||||
throw new BadRequestException('id_absence requis pour operation=update');
|
||||
throw new BadRequestException('id_evenement requis pour operation=update');
|
||||
}
|
||||
await this.absencesService.maj(userId, role, absenceId, {
|
||||
await this.evenementsService.maj(userId, role, absenceId, {
|
||||
date_debut: dto.date_debut,
|
||||
date_fin: dto.date_fin,
|
||||
motif: dto.motif,
|
||||
// Congé accepté modifié → repasse en attente via cartes respond flow;
|
||||
// pour absence enfant update immédiat déjà fait.
|
||||
...(dto.type_code === 'conge_am'
|
||||
? { statut: StatutAbsenceGardeType.EN_ATTENTE }
|
||||
? { statut: StatutEvenementAgendaType.EN_ATTENTE }
|
||||
: {}),
|
||||
});
|
||||
}
|
||||
@@ -146,7 +169,7 @@ export class CardsService {
|
||||
const card = this.cardsRepo.create({
|
||||
type_code: type.code,
|
||||
id_placement: dto.id_placement,
|
||||
id_absence: absenceId,
|
||||
id_evenement: absenceId,
|
||||
cree_par: userId,
|
||||
operation,
|
||||
statut: statutInitial,
|
||||
@@ -204,22 +227,24 @@ export class CardsService {
|
||||
throw new BadRequestException('Motivation obligatoire en cas de refus');
|
||||
}
|
||||
|
||||
await this.responsesRepo.insert({
|
||||
id_card: card.id,
|
||||
id_utilisateur: userId,
|
||||
action: dto.action,
|
||||
comment: dto.comment?.trim() || undefined,
|
||||
});
|
||||
await this.responsesRepo.save(
|
||||
this.responsesRepo.create({
|
||||
card: { id: card.id },
|
||||
user: { id: userId },
|
||||
action: dto.action,
|
||||
comment: dto.comment?.trim() || undefined,
|
||||
}),
|
||||
);
|
||||
|
||||
if (card.id_absence) {
|
||||
if (card.id_evenement) {
|
||||
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
||||
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||
statut: StatutAbsenceGardeType.ACCEPTE,
|
||||
await this.evenementsService.maj(userId, role, card.id_evenement, {
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
});
|
||||
card.statut = CardInstanceStatutType.TRAITEE;
|
||||
} else if (dto.action === CardResponseActionType.REFUSE) {
|
||||
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||
statut: StatutAbsenceGardeType.REFUSE,
|
||||
await this.evenementsService.maj(userId, role, card.id_evenement, {
|
||||
statut: StatutEvenementAgendaType.REFUSE,
|
||||
motif: dto.comment!.trim(),
|
||||
});
|
||||
card.statut = CardInstanceStatutType.REFUSEE;
|
||||
@@ -229,7 +254,12 @@ export class CardsService {
|
||||
}
|
||||
|
||||
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||
await this.cardsRepo.save(card);
|
||||
// Ne pas cardsRepo.save(card) avec relations chargées : TypeORM peut
|
||||
// resynchroniser les FK enfants (UPDATE … SET id_card=null).
|
||||
await this.cardsRepo.update(
|
||||
{ id: card.id },
|
||||
{ statut: card.statut, purge_at: card.purge_at },
|
||||
);
|
||||
const full = await this.loadCard(cardId);
|
||||
const dtoOut = this.toDto(full, userId);
|
||||
this.emitAudience(full, 'response.added', {
|
||||
@@ -264,12 +294,12 @@ export class CardsService {
|
||||
throw new BadRequestException('Dates invalides');
|
||||
}
|
||||
|
||||
if (card.id_absence) {
|
||||
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||
if (card.id_evenement) {
|
||||
await this.evenementsService.maj(userId, role, card.id_evenement, {
|
||||
date_debut: debut,
|
||||
date_fin: fin,
|
||||
motif: dto.motif,
|
||||
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||
statut: StatutEvenementAgendaType.EN_ATTENTE,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -281,7 +311,12 @@ export class CardsService {
|
||||
};
|
||||
card.statut = CardInstanceStatutType.OUVERTE;
|
||||
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||
await this.cardsRepo.save(card);
|
||||
await this.cardsRepo.manager.query(
|
||||
`UPDATE card_instances
|
||||
SET statut = $1, purge_at = $2, payload = $3::jsonb, modifie_le = now()
|
||||
WHERE id = $4`,
|
||||
[card.statut, card.purge_at, JSON.stringify(card.payload), card.id],
|
||||
);
|
||||
const full = await this.loadCard(cardId);
|
||||
const dtoOut = this.toDto(full, userId);
|
||||
this.emitAudience(full, 'card.updated', dtoOut);
|
||||
@@ -298,17 +333,17 @@ export class CardsService {
|
||||
throw new ForbiddenException('Seul le créateur peut supprimer cette carte');
|
||||
}
|
||||
const audienceIds = await this.audienceUserIds(card);
|
||||
if (card.id_absence) {
|
||||
if (card.id_evenement) {
|
||||
const absStatut =
|
||||
card.statut === CardInstanceStatutType.TRAITEE
|
||||
? null
|
||||
: card.id_absence;
|
||||
: card.id_evenement;
|
||||
// Supprime l’absence liée si pas encore acceptée définitivement
|
||||
if (
|
||||
card.statut === CardInstanceStatutType.OUVERTE ||
|
||||
card.statut === CardInstanceStatutType.REFUSEE
|
||||
) {
|
||||
await this.absencesService.supprimer(userId, role, card.id_absence);
|
||||
await this.evenementsService.supprimer(userId, role, card.id_evenement);
|
||||
}
|
||||
void absStatut;
|
||||
}
|
||||
@@ -336,13 +371,13 @@ export class CardsService {
|
||||
return rows.map((r) => r.id_utilisateur);
|
||||
}
|
||||
|
||||
private mapAbsenceType(typeCode: string): TypeAbsenceGardeType {
|
||||
private mapAbsenceType(typeCode: string): TypeEvenementAgendaType {
|
||||
if (typeCode === 'absence_enfant' || typeCode === 'absence_enfant_modif') {
|
||||
return TypeAbsenceGardeType.ABSENCE_ENFANT;
|
||||
return TypeEvenementAgendaType.ABSENCE_ENFANT;
|
||||
}
|
||||
if (typeCode === 'conge_am') return TypeAbsenceGardeType.CONGE_AM;
|
||||
if (typeCode === 'conge_am') return TypeEvenementAgendaType.CONGE_AM;
|
||||
if (typeCode === 'arret_maladie_am') {
|
||||
return TypeAbsenceGardeType.ARRET_MALADIE_AM;
|
||||
return TypeEvenementAgendaType.ARRET_MALADIE_AM;
|
||||
}
|
||||
throw new BadRequestException(`Type non mappé à une absence: ${typeCode}`);
|
||||
}
|
||||
@@ -350,7 +385,7 @@ export class CardsService {
|
||||
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`,
|
||||
`UPDATE evenements_agenda SET id_card_instance = $1, modifie_le = now() WHERE id = $2`,
|
||||
[cardId, absenceId],
|
||||
);
|
||||
}
|
||||
@@ -372,12 +407,25 @@ export class CardsService {
|
||||
];
|
||||
|
||||
if (type.audience_resolver === 'couple_am') {
|
||||
// Destinataire métier = AM + miroir foyer : tous les co-parents de l’enfant
|
||||
members.push({
|
||||
id_card: card.id,
|
||||
id_utilisateur: placement.amId,
|
||||
role_snapshot: RoleType.ASSISTANTE_MATERNELLE,
|
||||
is_creator: false,
|
||||
});
|
||||
const liensAm = await this.parentsChildrenRepo.find({
|
||||
where: { enfantId: placement.enfantId },
|
||||
});
|
||||
for (const l of liensAm) {
|
||||
if (l.parentId === creatorId) continue;
|
||||
members.push({
|
||||
id_card: card.id,
|
||||
id_utilisateur: l.parentId,
|
||||
role_snapshot: RoleType.PARENT,
|
||||
is_creator: false,
|
||||
});
|
||||
}
|
||||
} else if (type.audience_resolver === 'couple_parents') {
|
||||
const liens = await this.parentsChildrenRepo.find({
|
||||
where: { enfantId: placement.enfantId },
|
||||
@@ -469,9 +517,8 @@ export class CardsService {
|
||||
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,
|
||||
id_evenement: card.id_evenement ?? null,
|
||||
operation: card.operation,
|
||||
statut: card.statut,
|
||||
payload: card.payload ?? {},
|
||||
|
||||
@@ -38,11 +38,11 @@ export class CreerCarteDto {
|
||||
motif?: string;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
description: 'Requis pour operation=update (même id absences_garde)',
|
||||
description: 'Requis pour operation=update (même id evenements_agenda)',
|
||||
})
|
||||
@IsOptional()
|
||||
@IsUUID()
|
||||
id_absence?: string;
|
||||
id_evenement?: string;
|
||||
|
||||
@ApiPropertyOptional({ enum: CardOperationType, default: CardOperationType.CREATE })
|
||||
@IsOptional()
|
||||
@@ -91,14 +91,11 @@ export class CarteDto {
|
||||
@ApiProperty()
|
||||
titre: string;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
couleur?: string | null;
|
||||
|
||||
@ApiProperty()
|
||||
id_placement: string;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
id_absence?: string | null;
|
||||
id_evenement?: string | null;
|
||||
|
||||
@ApiProperty({ enum: CardOperationType })
|
||||
operation: CardOperationType;
|
||||
|
||||
@@ -9,18 +9,18 @@ import {
|
||||
MinLength,
|
||||
} from 'class-validator';
|
||||
import {
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
|
||||
export class CreerAbsenceGardeDto {
|
||||
export class CreerEvenementAgendaDto {
|
||||
@ApiProperty({ description: 'Placement AM↔enfant (couple)' })
|
||||
@IsUUID()
|
||||
id_placement: string;
|
||||
|
||||
@ApiProperty({ enum: TypeAbsenceGardeType })
|
||||
@IsEnum(TypeAbsenceGardeType)
|
||||
type: TypeAbsenceGardeType;
|
||||
@ApiProperty({ enum: TypeEvenementAgendaType })
|
||||
@IsEnum(TypeEvenementAgendaType)
|
||||
type: TypeEvenementAgendaType;
|
||||
|
||||
@ApiProperty({ example: '2026-10-01' })
|
||||
@IsDateString()
|
||||
@@ -37,7 +37,7 @@ export class CreerAbsenceGardeDto {
|
||||
motif?: string;
|
||||
}
|
||||
|
||||
export class MajAbsenceGardeDto {
|
||||
export class MajEvenementAgendaDto {
|
||||
@ApiPropertyOptional({ example: '2026-10-02' })
|
||||
@IsOptional()
|
||||
@IsDateString()
|
||||
@@ -48,10 +48,10 @@ export class MajAbsenceGardeDto {
|
||||
@IsDateString()
|
||||
date_fin?: string;
|
||||
|
||||
@ApiPropertyOptional({ enum: StatutAbsenceGardeType })
|
||||
@ApiPropertyOptional({ enum: StatutEvenementAgendaType })
|
||||
@IsOptional()
|
||||
@IsEnum(StatutAbsenceGardeType)
|
||||
statut?: StatutAbsenceGardeType;
|
||||
@IsEnum(StatutEvenementAgendaType)
|
||||
statut?: StatutEvenementAgendaType;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
description: 'Motivation de refus (parent) ou motif créateur',
|
||||
@@ -63,15 +63,15 @@ export class MajAbsenceGardeDto {
|
||||
motif?: string;
|
||||
}
|
||||
|
||||
export class AbsenceGardeDto {
|
||||
export class EvenementAgendaDto {
|
||||
@ApiProperty()
|
||||
id: string;
|
||||
|
||||
@ApiProperty()
|
||||
id_placement: string;
|
||||
|
||||
@ApiProperty({ enum: TypeAbsenceGardeType })
|
||||
type: TypeAbsenceGardeType;
|
||||
@ApiProperty({ enum: TypeEvenementAgendaType })
|
||||
type: TypeEvenementAgendaType;
|
||||
|
||||
@ApiProperty()
|
||||
date_debut: string;
|
||||
@@ -79,8 +79,8 @@ export class AbsenceGardeDto {
|
||||
@ApiProperty()
|
||||
date_fin: string;
|
||||
|
||||
@ApiProperty({ enum: StatutAbsenceGardeType })
|
||||
statut: StatutAbsenceGardeType;
|
||||
@ApiProperty({ enum: StatutEvenementAgendaType })
|
||||
statut: StatutEvenementAgendaType;
|
||||
|
||||
@ApiProperty()
|
||||
expire_at: string;
|
||||
@@ -113,7 +113,7 @@ export class AbsenceGardeDto {
|
||||
modifie_le: string;
|
||||
}
|
||||
|
||||
export class ListeAbsencesGardeDto {
|
||||
@ApiProperty({ type: [AbsenceGardeDto] })
|
||||
items: AbsenceGardeDto[];
|
||||
export class ListeEvenementsAgendaDto {
|
||||
@ApiProperty({ type: [EvenementAgendaDto] })
|
||||
items: EvenementAgendaDto[];
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { AbsencesGardeController } from './absences-garde.controller';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
import { EvenementsAgendaController } from './evenements-agenda.controller';
|
||||
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
import { TypeAbsenceGardeType } from 'src/entities/absences_garde.entity';
|
||||
import { TypeEvenementAgendaType } from 'src/entities/evenements_agenda.entity';
|
||||
|
||||
describe('AbsencesGardeController (#172)', () => {
|
||||
let controller: AbsencesGardeController;
|
||||
describe('EvenementsAgendaController (#172)', () => {
|
||||
let controller: EvenementsAgendaController;
|
||||
const serviceMock = {
|
||||
lister: jest.fn(),
|
||||
creer: jest.fn(),
|
||||
@@ -17,8 +17,8 @@ describe('AbsencesGardeController (#172)', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
controllers: [AbsencesGardeController],
|
||||
providers: [{ provide: AbsencesGardeService, useValue: serviceMock }],
|
||||
controllers: [EvenementsAgendaController],
|
||||
providers: [{ provide: EvenementsAgendaService, useValue: serviceMock }],
|
||||
})
|
||||
.overrideGuard(AuthGuard)
|
||||
.useValue({ canActivate: () => true })
|
||||
@@ -26,7 +26,7 @@ describe('AbsencesGardeController (#172)', () => {
|
||||
.useValue({ canActivate: () => true })
|
||||
.compile();
|
||||
|
||||
controller = module.get(AbsencesGardeController);
|
||||
controller = module.get(EvenementsAgendaController);
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
@@ -59,7 +59,7 @@ describe('AbsencesGardeController (#172)', () => {
|
||||
serviceMock.creer.mockResolvedValue({ id: 'a1' });
|
||||
const dto = {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-02',
|
||||
};
|
||||
@@ -25,49 +25,49 @@ import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||
import { User } from 'src/common/decorators/user.decorator';
|
||||
import {
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
import {
|
||||
AbsenceGardeDto,
|
||||
CreerAbsenceGardeDto,
|
||||
ListeAbsencesGardeDto,
|
||||
MajAbsenceGardeDto,
|
||||
} from './dto/absences-garde.dto';
|
||||
EvenementAgendaDto,
|
||||
CreerEvenementAgendaDto,
|
||||
ListeEvenementsAgendaDto,
|
||||
MajEvenementAgendaDto,
|
||||
} from './dto/evenements-agenda.dto';
|
||||
|
||||
@ApiTags('Absences garde')
|
||||
@ApiTags('Événements agenda')
|
||||
@ApiBearerAuth('access-token')
|
||||
@Controller('absences-garde')
|
||||
@Controller('evenements-agenda')
|
||||
@UseGuards(AuthGuard, RolesGuard)
|
||||
export class AbsencesGardeController {
|
||||
constructor(private readonly absencesGardeService: AbsencesGardeService) {}
|
||||
export class EvenementsAgendaController {
|
||||
constructor(private readonly evenementsAgendaService: EvenementsAgendaService) {}
|
||||
|
||||
@Get()
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({
|
||||
summary: 'Lister les absences / congés / arrêts — ticket #172',
|
||||
summary: 'Lister les absences / congés / arrêts — ticket #205 / ex-#172',
|
||||
description:
|
||||
'Sans placementId : tous les placements du user (parent = famille multi-AM ; AM = tous accueils). ' +
|
||||
'Avec placementId : un couple enfant–AM.',
|
||||
})
|
||||
@ApiQuery({ name: 'placementId', required: false })
|
||||
@ApiQuery({ name: 'type', required: false, enum: TypeAbsenceGardeType })
|
||||
@ApiQuery({ name: 'statut', required: false, enum: StatutAbsenceGardeType })
|
||||
@ApiQuery({ name: 'type', required: false, enum: TypeEvenementAgendaType })
|
||||
@ApiQuery({ name: 'statut', required: false, enum: StatutEvenementAgendaType })
|
||||
@ApiQuery({ name: 'from', required: false, description: 'YYYY-MM-DD' })
|
||||
@ApiQuery({ name: 'to', required: false, description: 'YYYY-MM-DD' })
|
||||
@ApiResponse({ status: 200, type: ListeAbsencesGardeDto })
|
||||
@ApiResponse({ status: 200, type: ListeEvenementsAgendaDto })
|
||||
lister(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Query('placementId') placementId?: string,
|
||||
@Query('type') type?: TypeAbsenceGardeType,
|
||||
@Query('statut') statut?: StatutAbsenceGardeType,
|
||||
@Query('type') type?: TypeEvenementAgendaType,
|
||||
@Query('statut') statut?: StatutEvenementAgendaType,
|
||||
@Query('from') from?: string,
|
||||
@Query('to') to?: string,
|
||||
): Promise<ListeAbsencesGardeDto> {
|
||||
return this.absencesGardeService.lister(userId, role, {
|
||||
): Promise<ListeEvenementsAgendaDto> {
|
||||
return this.evenementsAgendaService.lister(userId, role, {
|
||||
placementId,
|
||||
type,
|
||||
statut,
|
||||
@@ -79,15 +79,15 @@ export class AbsencesGardeController {
|
||||
@Post()
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({ summary: 'Créer une période d’absence / congé / arrêt — #172' })
|
||||
@ApiBody({ type: CreerAbsenceGardeDto })
|
||||
@ApiResponse({ status: 201, type: AbsenceGardeDto })
|
||||
@ApiBody({ type: CreerEvenementAgendaDto })
|
||||
@ApiResponse({ status: 201, type: EvenementAgendaDto })
|
||||
@HttpCode(HttpStatus.CREATED)
|
||||
creer(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Body() dto: CreerAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
return this.absencesGardeService.creer(userId, role, dto);
|
||||
@Body() dto: CreerEvenementAgendaDto,
|
||||
): Promise<EvenementAgendaDto> {
|
||||
return this.evenementsAgendaService.creer(userId, role, dto);
|
||||
}
|
||||
|
||||
@Patch(':id')
|
||||
@@ -98,15 +98,15 @@ export class AbsencesGardeController {
|
||||
'Parent : accept/refuse congé (motivation si refus), ack arrêt. ' +
|
||||
'AM : modifier dates (en attente / refuse / accepté), republication après refus.',
|
||||
})
|
||||
@ApiBody({ type: MajAbsenceGardeDto })
|
||||
@ApiResponse({ status: 200, type: AbsenceGardeDto })
|
||||
@ApiBody({ type: MajEvenementAgendaDto })
|
||||
@ApiResponse({ status: 200, type: EvenementAgendaDto })
|
||||
maj(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Param('id', ParseUUIDPipe) id: string,
|
||||
@Body() dto: MajAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
return this.absencesGardeService.maj(userId, role, id, dto);
|
||||
@Body() dto: MajEvenementAgendaDto,
|
||||
): Promise<EvenementAgendaDto> {
|
||||
return this.evenementsAgendaService.maj(userId, role, id, dto);
|
||||
}
|
||||
|
||||
@Delete(':id')
|
||||
@@ -119,6 +119,6 @@ export class AbsencesGardeController {
|
||||
@User('role') role: RoleType,
|
||||
@Param('id', ParseUUIDPipe) id: string,
|
||||
): Promise<void> {
|
||||
await this.absencesGardeService.supprimer(userId, role, id);
|
||||
await this.evenementsAgendaService.supprimer(userId, role, id);
|
||||
}
|
||||
}
|
||||
@@ -2,15 +2,15 @@ import { Module } from '@nestjs/common';
|
||||
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||
import { JwtModule } from '@nestjs/jwt';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
||||
import { EvenementsAgenda } from 'src/entities/evenements_agenda.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { AbsencesGardeController } from './absences-garde.controller';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
import { EvenementsAgendaController } from './evenements-agenda.controller';
|
||||
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
||||
TypeOrmModule.forFeature([EvenementsAgenda, AmChildren, ParentsChildren]),
|
||||
JwtModule.registerAsync({
|
||||
imports: [ConfigModule],
|
||||
useFactory: (config: ConfigService) => ({
|
||||
@@ -20,8 +20,8 @@ import { AbsencesGardeService } from './absences-garde.service';
|
||||
inject: [ConfigService],
|
||||
}),
|
||||
],
|
||||
controllers: [AbsencesGardeController],
|
||||
providers: [AbsencesGardeService],
|
||||
exports: [AbsencesGardeService],
|
||||
controllers: [EvenementsAgendaController],
|
||||
providers: [EvenementsAgendaService],
|
||||
exports: [EvenementsAgendaService],
|
||||
})
|
||||
export class AbsencesGardeModule {}
|
||||
export class EvenementsAgendaModule {}
|
||||
@@ -1,18 +1,18 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||
import { ForbiddenException, BadRequestException } from '@nestjs/common';
|
||||
import { AbsencesGardeService } from './absences-garde.service';
|
||||
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
import {
|
||||
AbsencesGarde,
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
EvenementsAgenda,
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
|
||||
describe('AbsencesGardeService (#172)', () => {
|
||||
let service: AbsencesGardeService;
|
||||
describe('EvenementsAgendaService (#172)', () => {
|
||||
let service: EvenementsAgendaService;
|
||||
const absencesRepo = {
|
||||
create: jest.fn((x) => x),
|
||||
save: jest.fn(async (x) => ({
|
||||
@@ -37,8 +37,8 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
providers: [
|
||||
AbsencesGardeService,
|
||||
{ provide: getRepositoryToken(AbsencesGarde), useValue: absencesRepo },
|
||||
EvenementsAgendaService,
|
||||
{ provide: getRepositoryToken(EvenementsAgenda), useValue: absencesRepo },
|
||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||
{
|
||||
provide: getRepositoryToken(ParentsChildren),
|
||||
@@ -46,7 +46,7 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
},
|
||||
],
|
||||
}).compile();
|
||||
service = module.get(AbsencesGardeService);
|
||||
service = module.get(EvenementsAgendaService);
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
@@ -68,10 +68,10 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-02',
|
||||
statut: StatutAbsenceGardeType.ACCEPTE,
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
@@ -85,15 +85,15 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
|
||||
const res = await service.creer('p-1', RoleType.PARENT, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-02',
|
||||
});
|
||||
|
||||
expect(absencesRepo.save).toHaveBeenCalled();
|
||||
const savedArg = absencesRepo.save.mock.calls[0][0];
|
||||
expect(savedArg.statut).toBe(StatutAbsenceGardeType.ACCEPTE);
|
||||
expect(res.type).toBe(TypeAbsenceGardeType.ABSENCE_ENFANT);
|
||||
expect(savedArg.statut).toBe(StatutEvenementAgendaType.ACCEPTE);
|
||||
expect(res.type).toBe(TypeEvenementAgendaType.ABSENCE_ENFANT);
|
||||
});
|
||||
|
||||
it('parent ne peut pas créer un congé AM', async () => {
|
||||
@@ -110,7 +110,7 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
await expect(
|
||||
service.creer('p-1', RoleType.PARENT, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.CONGE_AM,
|
||||
type: TypeEvenementAgendaType.CONGE_AM,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-05',
|
||||
}),
|
||||
@@ -121,10 +121,10 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.CONGE_AM,
|
||||
type: TypeEvenementAgendaType.CONGE_AM,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-05',
|
||||
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||
statut: StatutEvenementAgendaType.EN_ATTENTE,
|
||||
expire_at: new Date(),
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
@@ -140,7 +140,7 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
|
||||
await expect(
|
||||
service.maj('p-1', RoleType.PARENT, 'abs-1', {
|
||||
statut: StatutAbsenceGardeType.REFUSE,
|
||||
statut: StatutEvenementAgendaType.REFUSE,
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
@@ -159,7 +159,7 @@ describe('AbsencesGardeService (#172)', () => {
|
||||
await expect(
|
||||
service.creer('p-1', RoleType.PARENT, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-10',
|
||||
date_fin: '2026-10-01',
|
||||
}),
|
||||
@@ -7,19 +7,19 @@ import {
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { In, IsNull, Repository } from 'typeorm';
|
||||
import {
|
||||
AbsencesGarde,
|
||||
StatutAbsenceGardeType,
|
||||
TypeAbsenceGardeType,
|
||||
} from 'src/entities/absences_garde.entity';
|
||||
EvenementsAgenda,
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
import {
|
||||
AbsenceGardeDto,
|
||||
CreerAbsenceGardeDto,
|
||||
ListeAbsencesGardeDto,
|
||||
MajAbsenceGardeDto,
|
||||
} from './dto/absences-garde.dto';
|
||||
EvenementAgendaDto,
|
||||
CreerEvenementAgendaDto,
|
||||
ListeEvenementsAgendaDto,
|
||||
MajEvenementAgendaDto,
|
||||
} from './dto/evenements-agenda.dto';
|
||||
|
||||
const TTL_EN_ATTENTE_MS = 15 * 24 * 60 * 60 * 1000;
|
||||
const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
||||
@@ -27,10 +27,10 @@ const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
||||
const EXPIRE_ACCEPTE = new Date('9999-12-31T23:59:59.999Z');
|
||||
|
||||
@Injectable()
|
||||
export class AbsencesGardeService {
|
||||
export class EvenementsAgendaService {
|
||||
constructor(
|
||||
@InjectRepository(AbsencesGarde)
|
||||
private readonly absencesRepo: Repository<AbsencesGarde>,
|
||||
@InjectRepository(EvenementsAgenda)
|
||||
private readonly absencesRepo: Repository<EvenementsAgenda>,
|
||||
@InjectRepository(AmChildren)
|
||||
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||
@InjectRepository(ParentsChildren)
|
||||
@@ -42,12 +42,12 @@ export class AbsencesGardeService {
|
||||
role: RoleType,
|
||||
opts: {
|
||||
placementId?: string;
|
||||
type?: TypeAbsenceGardeType;
|
||||
statut?: StatutAbsenceGardeType;
|
||||
type?: TypeEvenementAgendaType;
|
||||
statut?: StatutEvenementAgendaType;
|
||||
from?: string;
|
||||
to?: string;
|
||||
},
|
||||
): Promise<ListeAbsencesGardeDto> {
|
||||
): Promise<ListeEvenementsAgendaDto> {
|
||||
const placementIds = await this.resolvePlacementIds(
|
||||
userId,
|
||||
role,
|
||||
@@ -86,8 +86,8 @@ export class AbsencesGardeService {
|
||||
async creer(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
dto: CreerAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
dto: CreerEvenementAgendaDto,
|
||||
): Promise<EvenementAgendaDto> {
|
||||
this.assertDates(dto.date_debut, dto.date_fin);
|
||||
await this.assertCanAccessPlacement(userId, role, dto.id_placement);
|
||||
this.assertCanCreateType(role, dto.type);
|
||||
@@ -111,8 +111,8 @@ export class AbsencesGardeService {
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
id: string,
|
||||
dto: MajAbsenceGardeDto,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
dto: MajEvenementAgendaDto,
|
||||
): Promise<EvenementAgendaDto> {
|
||||
const row = await this.absencesRepo.findOne({ where: { id } });
|
||||
if (!row) {
|
||||
throw new NotFoundException('Absence introuvable');
|
||||
@@ -128,15 +128,15 @@ export class AbsencesGardeService {
|
||||
this.assertCanEditDates(role, row);
|
||||
row.date_debut = debut;
|
||||
row.date_fin = fin;
|
||||
if (row.statut === StatutAbsenceGardeType.EN_ATTENTE) {
|
||||
row.expire_at = this.expireAtFor(StatutAbsenceGardeType.EN_ATTENTE);
|
||||
if (row.statut === StatutEvenementAgendaType.EN_ATTENTE) {
|
||||
row.expire_at = this.expireAtFor(StatutEvenementAgendaType.EN_ATTENTE);
|
||||
}
|
||||
}
|
||||
|
||||
if (dto.statut !== undefined && dto.statut !== row.statut) {
|
||||
this.assertCanChangeStatut(role, row, dto.statut, dto.motif);
|
||||
if (
|
||||
dto.statut === StatutAbsenceGardeType.REFUSE &&
|
||||
dto.statut === StatutEvenementAgendaType.REFUSE &&
|
||||
(!dto.motif || !dto.motif.trim())
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
@@ -169,7 +169,7 @@ export class AbsencesGardeService {
|
||||
|
||||
if (
|
||||
role === RoleType.PARENT &&
|
||||
row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT
|
||||
row.type !== TypeEvenementAgendaType.ABSENCE_ENFANT
|
||||
) {
|
||||
throw new ForbiddenException(
|
||||
'Un parent ne peut supprimer que les absences enfant',
|
||||
@@ -183,7 +183,7 @@ export class AbsencesGardeService {
|
||||
id: string,
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
): Promise<AbsenceGardeDto> {
|
||||
): Promise<EvenementAgendaDto> {
|
||||
const row = await this.absencesRepo.findOne({
|
||||
where: { id },
|
||||
relations: ['placement', 'placement.child', 'placement.am', 'placement.am.user'],
|
||||
@@ -195,19 +195,19 @@ export class AbsencesGardeService {
|
||||
return this.toDto(row);
|
||||
}
|
||||
|
||||
private statutInitial(type: TypeAbsenceGardeType): StatutAbsenceGardeType {
|
||||
if (type === TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||
return StatutAbsenceGardeType.ACCEPTE;
|
||||
private statutInitial(type: TypeEvenementAgendaType): StatutEvenementAgendaType {
|
||||
if (type === TypeEvenementAgendaType.ABSENCE_ENFANT) {
|
||||
return StatutEvenementAgendaType.ACCEPTE;
|
||||
}
|
||||
return StatutAbsenceGardeType.EN_ATTENTE;
|
||||
return StatutEvenementAgendaType.EN_ATTENTE;
|
||||
}
|
||||
|
||||
private expireAtFor(statut: StatutAbsenceGardeType): Date {
|
||||
private expireAtFor(statut: StatutEvenementAgendaType): Date {
|
||||
const now = Date.now();
|
||||
if (statut === StatutAbsenceGardeType.ACCEPTE) {
|
||||
if (statut === StatutEvenementAgendaType.ACCEPTE) {
|
||||
return EXPIRE_ACCEPTE;
|
||||
}
|
||||
if (statut === StatutAbsenceGardeType.REFUSE) {
|
||||
if (statut === StatutEvenementAgendaType.REFUSE) {
|
||||
return new Date(now + TTL_REFUSE_MS);
|
||||
}
|
||||
return new Date(now + TTL_EN_ATTENTE_MS);
|
||||
@@ -221,9 +221,9 @@ export class AbsencesGardeService {
|
||||
}
|
||||
}
|
||||
|
||||
private assertCanCreateType(role: RoleType, type: TypeAbsenceGardeType): void {
|
||||
private assertCanCreateType(role: RoleType, type: TypeEvenementAgendaType): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
if (type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||
if (type !== TypeEvenementAgendaType.ABSENCE_ENFANT) {
|
||||
throw new ForbiddenException(
|
||||
'Un parent ne peut créer que des absences enfant',
|
||||
);
|
||||
@@ -232,8 +232,8 @@ export class AbsencesGardeService {
|
||||
}
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
if (
|
||||
type !== TypeAbsenceGardeType.CONGE_AM &&
|
||||
type !== TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||
type !== TypeEvenementAgendaType.CONGE_AM &&
|
||||
type !== TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||
) {
|
||||
throw new ForbiddenException(
|
||||
'Une AM ne peut créer que congé ou arrêt maladie',
|
||||
@@ -246,10 +246,10 @@ export class AbsencesGardeService {
|
||||
|
||||
private assertCanEditDates(
|
||||
role: RoleType,
|
||||
row: AbsencesGarde,
|
||||
row: EvenementsAgenda,
|
||||
): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
if (row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||
if (row.type !== TypeEvenementAgendaType.ABSENCE_ENFANT) {
|
||||
throw new ForbiddenException(
|
||||
'Un parent ne peut modifier que les absences enfant',
|
||||
);
|
||||
@@ -258,13 +258,13 @@ export class AbsencesGardeService {
|
||||
}
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
if (
|
||||
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM ||
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||
) {
|
||||
if (
|
||||
row.statut !== StatutAbsenceGardeType.EN_ATTENTE &&
|
||||
row.statut !== StatutAbsenceGardeType.REFUSE &&
|
||||
row.statut !== StatutAbsenceGardeType.ACCEPTE
|
||||
row.statut !== StatutEvenementAgendaType.EN_ATTENTE &&
|
||||
row.statut !== StatutEvenementAgendaType.REFUSE &&
|
||||
row.statut !== StatutEvenementAgendaType.ACCEPTE
|
||||
) {
|
||||
throw new ForbiddenException('Statut incompatible avec une modification');
|
||||
}
|
||||
@@ -278,31 +278,31 @@ export class AbsencesGardeService {
|
||||
|
||||
private assertCanChangeStatut(
|
||||
role: RoleType,
|
||||
row: AbsencesGarde,
|
||||
next: StatutAbsenceGardeType,
|
||||
row: EvenementsAgenda,
|
||||
next: StatutEvenementAgendaType,
|
||||
_motif?: string,
|
||||
): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
// Accept / refuse congé ; ack arrêt (accepte)
|
||||
if (
|
||||
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM ||
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||
) {
|
||||
if (
|
||||
next !== StatutAbsenceGardeType.ACCEPTE &&
|
||||
next !== StatutAbsenceGardeType.REFUSE
|
||||
next !== StatutEvenementAgendaType.ACCEPTE &&
|
||||
next !== StatutEvenementAgendaType.REFUSE
|
||||
) {
|
||||
throw new BadRequestException('Transition de statut invalide');
|
||||
}
|
||||
if (
|
||||
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM &&
|
||||
next === StatutAbsenceGardeType.REFUSE
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM &&
|
||||
next === StatutEvenementAgendaType.REFUSE
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'Un arrêt maladie ne se refuse pas (accusé seulement)',
|
||||
);
|
||||
}
|
||||
if (row.statut !== StatutAbsenceGardeType.EN_ATTENTE) {
|
||||
if (row.statut !== StatutEvenementAgendaType.EN_ATTENTE) {
|
||||
throw new BadRequestException('Cette demande n’est plus en attente');
|
||||
}
|
||||
return;
|
||||
@@ -314,9 +314,9 @@ export class AbsencesGardeService {
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
// Remise en attente après refus OU modification d’un congé déjà accepté (S2b)
|
||||
if (
|
||||
next === StatutAbsenceGardeType.EN_ATTENTE &&
|
||||
(row.statut === StatutAbsenceGardeType.REFUSE ||
|
||||
row.statut === StatutAbsenceGardeType.ACCEPTE)
|
||||
next === StatutEvenementAgendaType.EN_ATTENTE &&
|
||||
(row.statut === StatutEvenementAgendaType.REFUSE ||
|
||||
row.statut === StatutEvenementAgendaType.ACCEPTE)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
@@ -396,7 +396,7 @@ export class AbsencesGardeService {
|
||||
throw new ForbiddenException('Rôle non autorisé');
|
||||
}
|
||||
|
||||
private toDto(row: AbsencesGarde): AbsenceGardeDto {
|
||||
private toDto(row: EvenementsAgenda): EvenementAgendaDto {
|
||||
const child = row.placement?.child;
|
||||
const amUser = row.placement?.am?.user;
|
||||
return {
|
||||
@@ -0,0 +1,2 @@
|
||||
export { EvenementsAgendaModule } from './evenements-agenda.module';
|
||||
export { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
@@ -35,13 +35,13 @@ DO $$ BEGIN
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_avenant_type') THEN
|
||||
CREATE TYPE statut_avenant_type AS ENUM ('propose', 'accepte', 'refuse');
|
||||
END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type') THEN
|
||||
CREATE TYPE type_absence_garde_type AS ENUM (
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_agenda_type') THEN
|
||||
CREATE TYPE type_evenement_agenda_type AS ENUM (
|
||||
'absence_enfant', 'conge_am', 'arret_maladie_am'
|
||||
);
|
||||
END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type') THEN
|
||||
CREATE TYPE statut_absence_garde_type AS ENUM (
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_agenda_type') THEN
|
||||
CREATE TYPE statut_evenement_agenda_type AS ENUM (
|
||||
'en_attente', 'accepte', 'refuse'
|
||||
);
|
||||
END IF;
|
||||
@@ -322,32 +322,32 @@ CREATE TABLE avenants_contrats (
|
||||
);
|
||||
|
||||
-- ==========================================================
|
||||
-- Table : absences_garde (vérité métier absences/congés/arrêt)
|
||||
-- Table : evenements_agenda (vérité métier agenda (absences/congés/arrêt + futurs types))
|
||||
-- 1 ligne = 1 période ; rattachement = placement AM↔enfant (#193)
|
||||
-- ==========================================================
|
||||
CREATE TABLE absences_garde (
|
||||
CREATE TABLE evenements_agenda (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
id_placement UUID NOT NULL
|
||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||
type type_absence_garde_type NOT NULL,
|
||||
type type_evenement_agenda_type NOT NULL,
|
||||
date_debut DATE NOT NULL,
|
||||
date_fin DATE NOT NULL,
|
||||
statut statut_absence_garde_type NOT NULL DEFAULT 'en_attente',
|
||||
statut statut_evenement_agenda_type NOT NULL DEFAULT 'en_attente',
|
||||
expire_at TIMESTAMPTZ NOT NULL,
|
||||
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||
id_card_instance UUID,
|
||||
motif TEXT,
|
||||
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
CONSTRAINT chk_absences_garde_dates CHECK (date_fin >= date_debut)
|
||||
CONSTRAINT chk_evenements_agenda_dates CHECK (date_fin >= date_debut)
|
||||
);
|
||||
|
||||
CREATE INDEX idx_absences_garde_placement_dates
|
||||
ON absences_garde (id_placement, date_debut, date_fin);
|
||||
CREATE INDEX idx_absences_garde_placement_type_statut
|
||||
ON absences_garde (id_placement, type, statut);
|
||||
CREATE INDEX idx_absences_garde_expire_at
|
||||
ON absences_garde (expire_at)
|
||||
CREATE INDEX idx_evenements_agenda_placement_dates
|
||||
ON evenements_agenda (id_placement, date_debut, date_fin);
|
||||
CREATE INDEX idx_evenements_agenda_placement_type_statut
|
||||
ON evenements_agenda (id_placement, type, statut);
|
||||
CREATE INDEX idx_evenements_agenda_expire_at
|
||||
ON evenements_agenda (expire_at)
|
||||
WHERE statut IN ('en_attente', 'refuse');
|
||||
|
||||
-- ==========================================================
|
||||
|
||||
@@ -106,7 +106,7 @@ Ce document recense **toutes les valeurs énumérées** utilisées dans la base
|
||||
|
||||
## 7) Type d’absence de garde — `type`
|
||||
|
||||
**Tables/colonnes** : `absences_garde.type`
|
||||
**Tables/colonnes** : `evenements_agenda.type`
|
||||
**Valeurs autorisées** :
|
||||
|
||||
| Valeur | Description |
|
||||
@@ -115,13 +115,13 @@ Ce document recense **toutes les valeurs énumérées** utilisées dans la base
|
||||
| `conge_am` | Congé de l’assistante maternelle |
|
||||
| `arret_maladie_am` | Arrêt maladie AM |
|
||||
|
||||
> Remplace l’ancien enum `type_evenement_type` / table `evenements` (supprimés ticket #193).
|
||||
> Remplace l’ancien enum `type_evenement_type` / table `evenements` (supprimés ticket #205 / ex-#193).
|
||||
|
||||
---
|
||||
|
||||
## 8) Statut d’absence de garde — `statut`
|
||||
|
||||
**Tables/colonnes** : `absences_garde.statut`
|
||||
**Tables/colonnes** : `evenements_agenda.statut`
|
||||
**Valeurs autorisées** :
|
||||
|
||||
| Valeur | Description |
|
||||
|
||||
@@ -42,8 +42,8 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
||||
| **contrats(id_dossier)** → `dossiers(id)` | **CASCADE** | 1:1, contrat détruit si dossier supprimé |
|
||||
| **avenants_contrats(id_contrat)** → `contrats(id)` | **CASCADE** | Avenants détruits avec le contrat |
|
||||
| **avenants_contrats(initie_par)** → `utilisateurs(id)` | **SET NULL** | Historiser l’avenant sans bloquer |
|
||||
| **absences_garde(id_placement)** → `enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus d’absences |
|
||||
| **absences_garde(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver la période si user supprimé |
|
||||
| **evenements_agenda(id_placement)** → `enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus d’absences |
|
||||
| **evenements_agenda(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver la période si user supprimé |
|
||||
| **signalements_bugs(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Conserver le ticket même si compte supprimé |
|
||||
| **uploads(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Fichier reste référencé sans l’auteur |
|
||||
| **notifications(id_utilisateur)** → `utilisateurs(id)` | **CASCADE** | Notifications propres à l’utilisateur |
|
||||
@@ -77,8 +77,8 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
||||
- `avenants_contrats.initie_par` → **SET NULL**
|
||||
|
||||
### Événements
|
||||
- `absences_garde.id_placement` → **CASCADE**
|
||||
- `absences_garde.cree_par` → **SET NULL**
|
||||
- `evenements_agenda.id_placement` → **CASCADE**
|
||||
- `evenements_agenda.cree_par` → **SET NULL**
|
||||
|
||||
### Divers
|
||||
- `signalements_bugs.id_utilisateur` → **SET NULL**
|
||||
@@ -105,7 +105,7 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
||||
|
||||
4. **Suppression d’un enfant**
|
||||
- Supprimer `enfants(id=childA)`
|
||||
- Attendu : `enfants_parents` (CASCADE), `dossiers` du childA (CASCADE), `absences_garde` des placements du childA (CASCADE via EAM).
|
||||
- Attendu : `enfants_parents` (CASCADE), `dossiers` du childA (CASCADE), `evenements_agenda` des placements du childA (CASCADE via EAM).
|
||||
|
||||
5. **Suppression d’un utilisateur AM**
|
||||
- Supprimer `utilisateurs(id=amB)`
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
-- Ticket #205 — Renommer absences_garde → evenements_agenda
|
||||
-- Migration base live. Idempotent autant que possible.
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 1. Table + enums
|
||||
-- ---------------------------------------------------------------------------
|
||||
DO $$
|
||||
BEGIN
|
||||
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'absences_garde')
|
||||
AND NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'evenements_agenda') THEN
|
||||
ALTER TABLE absences_garde RENAME TO evenements_agenda;
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
DO $$
|
||||
BEGIN
|
||||
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type')
|
||||
AND NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_agenda_type') THEN
|
||||
ALTER TYPE type_absence_garde_type RENAME TO type_evenement_agenda_type;
|
||||
END IF;
|
||||
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type')
|
||||
AND NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_agenda_type') THEN
|
||||
ALTER TYPE statut_absence_garde_type RENAME TO statut_evenement_agenda_type;
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
-- Contraintes / index (noms)
|
||||
DO $$
|
||||
BEGIN
|
||||
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'chk_absences_garde_dates') THEN
|
||||
ALTER TABLE evenements_agenda RENAME CONSTRAINT chk_absences_garde_dates TO chk_evenements_agenda_dates;
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
ALTER INDEX IF EXISTS idx_absences_garde_placement_dates
|
||||
RENAME TO idx_evenements_agenda_placement_dates;
|
||||
ALTER INDEX IF EXISTS idx_absences_garde_placement_type_statut
|
||||
RENAME TO idx_evenements_agenda_placement_type_statut;
|
||||
ALTER INDEX IF EXISTS idx_absences_garde_expire_at
|
||||
RENAME TO idx_evenements_agenda_expire_at;
|
||||
ALTER INDEX IF EXISTS absences_garde_pkey
|
||||
RENAME TO evenements_agenda_pkey;
|
||||
|
||||
COMMENT ON TABLE evenements_agenda IS
|
||||
'Vérité métier agenda (absences, congés, arrêts, futurs soins/école/mairie/sorties…) par placement. Les cartes collectent ; cette table historise.';
|
||||
COMMENT ON COLUMN evenements_agenda.expire_at IS
|
||||
'Purge auto (job) pour en_attente/refuse. accepte → infinity.';
|
||||
COMMENT ON COLUMN evenements_agenda.id_card_instance IS
|
||||
'Réf. carte de collecte (module Cartes).';
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 2. card_instances.id_absence → id_evenement
|
||||
-- ---------------------------------------------------------------------------
|
||||
DO $$
|
||||
BEGIN
|
||||
IF EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'card_instances' AND column_name = 'id_absence'
|
||||
) AND NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'card_instances' AND column_name = 'id_evenement'
|
||||
) THEN
|
||||
ALTER TABLE card_instances RENAME COLUMN id_absence TO id_evenement;
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
-- Recréer index si ancien nom
|
||||
ALTER INDEX IF EXISTS idx_card_instances_absence
|
||||
RENAME TO idx_card_instances_evenement;
|
||||
|
||||
-- FK : drop ancienne (nom variable) puis recreate
|
||||
DO $$
|
||||
DECLARE
|
||||
fk_name text;
|
||||
BEGIN
|
||||
SELECT conname INTO fk_name
|
||||
FROM pg_constraint
|
||||
WHERE conrelid = 'card_instances'::regclass
|
||||
AND contype = 'f'
|
||||
AND pg_get_constraintdef(oid) ILIKE '%id_evenement%'
|
||||
LIMIT 1;
|
||||
|
||||
IF fk_name IS NULL THEN
|
||||
SELECT conname INTO fk_name
|
||||
FROM pg_constraint
|
||||
WHERE conrelid = 'card_instances'::regclass
|
||||
AND contype = 'f'
|
||||
AND pg_get_constraintdef(oid) ILIKE '%id_absence%'
|
||||
LIMIT 1;
|
||||
END IF;
|
||||
|
||||
IF fk_name IS NOT NULL THEN
|
||||
EXECUTE format('ALTER TABLE card_instances DROP CONSTRAINT %I', fk_name);
|
||||
END IF;
|
||||
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM pg_constraint
|
||||
WHERE conname = 'card_instances_id_evenement_fkey'
|
||||
) THEN
|
||||
ALTER TABLE card_instances
|
||||
ADD CONSTRAINT card_instances_id_evenement_fkey
|
||||
FOREIGN KEY (id_evenement)
|
||||
REFERENCES evenements_agenda(id)
|
||||
ON DELETE SET NULL;
|
||||
END IF;
|
||||
END $$;
|
||||
@@ -81,7 +81,7 @@ ORDER BY c.cree_le DESC;
|
||||
|
||||
\echo '=== 9) Absences_garde (30 derniers jours) ====================='
|
||||
SELECT ag.id, ag.type, ag.id_placement, ag.date_debut, ag.date_fin, ag.statut, ag.expire_at
|
||||
FROM absences_garde ag
|
||||
FROM evenements_agenda ag
|
||||
WHERE ag.date_debut >= (NOW()::date - INTERVAL '30 days')
|
||||
ORDER BY ag.date_debut DESC;
|
||||
|
||||
@@ -136,7 +136,7 @@ WHERE c.id IS NULL;
|
||||
|
||||
-- Absences sans placement
|
||||
SELECT ag.*
|
||||
FROM absences_garde ag
|
||||
FROM evenements_agenda ag
|
||||
LEFT JOIN enfants_assistantes_maternelles eam ON eam.id = ag.id_placement
|
||||
WHERE eam.id IS NULL;
|
||||
|
||||
@@ -150,10 +150,10 @@ WHERE m.id_dossier = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
|
||||
ORDER BY m.cree_le DESC
|
||||
LIMIT 20;
|
||||
|
||||
-- Absences par placement et période (idx_absences_garde_placement_dates)
|
||||
-- Absences par placement et période (idx_evenements_agenda_placement_dates)
|
||||
EXPLAIN ANALYZE
|
||||
SELECT ag.*
|
||||
FROM absences_garde ag
|
||||
FROM evenements_agenda ag
|
||||
WHERE ag.id_placement IS NOT NULL
|
||||
AND ag.date_debut >= '2025-01-01';
|
||||
|
||||
@@ -198,7 +198,7 @@ SELECT
|
||||
(SELECT COUNT(*) FROM messages) AS nb_messages,
|
||||
(SELECT COUNT(*) FROM contrats) AS nb_contrats,
|
||||
(SELECT COUNT(*) FROM avenants_contrats) AS nb_avenants,
|
||||
(SELECT COUNT(*) FROM absences_garde) AS nb_absences_garde,
|
||||
(SELECT COUNT(*) FROM evenements_agenda) AS nb_evenements_agenda,
|
||||
(SELECT COUNT(*) FROM uploads) AS nb_uploads,
|
||||
(SELECT COUNT(*) FROM notifications) AS nb_notifications,
|
||||
(SELECT COUNT(*) FROM validations) AS nb_validations;
|
||||
|
||||
@@ -572,14 +572,28 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
||||
|
||||
### 32. Module Absences + Cartes (séparation back / collecte)
|
||||
|
||||
**Décision** : ✅ **Back `absences_garde` = vérité métier** ; **Cartes = file d’attention / collecte** (plugin isolé). Types SYSTEM (absence, congé, arrêt) indéboulonnables ; types OPTIONNELS (sondages…) plus tard. Annulation = DELETE. `expire_at` dès V1.
|
||||
**Décision** : ✅ **Back `evenements_agenda` = vérité métier / agenda** ; **Cartes = file d’attention** (plugin isolé). Types SYSTEM (absence, congé, arrêt) indéboulonnables ; types OPTIONNELS (sondages, soins enfant, école, mairie, sorties…) plus tard. Annulation = DELETE. `expire_at` dès V1.
|
||||
|
||||
**Justification** :
|
||||
- Premier vrai module d’interaction multi-acteurs
|
||||
- Évite de stocker l’historique congés dans des bulles éphémères
|
||||
- Portabilité / généricité des cartes sans coupler le métier garde
|
||||
- Évite de stocker l’historique dans des bulles éphémères
|
||||
- Portabilité / généricité des cartes sans coupler le métier
|
||||
- **Différence avec le blog** : les cartes du fil = **événements d’agenda** (période + placement + historique) ; le blog = récit narratif du jour
|
||||
|
||||
**Flux V1** : BDD absences → API liste/CRUD → module Cartes SYSTEM → front bulles (séparé).
|
||||
**Modèle données** :
|
||||
- Table **`evenements_agenda`** (ex-`absences_garde`, rename [#205](https://git.ptits-pas.fr/jmartin/petitspas/issues/205)) — nom volontairement ouvert
|
||||
|
||||
**UI** : la **couleur** des bulles est un mapping **front** (`type_code` → teinte). L’API n’expose pas `couleur`.
|
||||
|
||||
**Flux V1** : BDD agenda → API liste/CRUD → module Cartes SYSTEM → front bulles (séparé).
|
||||
|
||||
**V1 cartes (réponses)** :
|
||||
- `absence_enfant` → info (`none`) — pas d’ack AM ; audience **AM + tous les parents du foyer** (co-parent inclus)
|
||||
- `arret_maladie_am` → ack parent (« Bien reçu »)
|
||||
- `conge_am` → accept / refuse (+ motivation refus)
|
||||
- **Modifs d’absence** → via **agenda / calendrier**, pas via bulle `absence_enfant_modif` (reporté au ticket calendrier)
|
||||
|
||||
**Réf. détail** : `docs/32_MINI-SPEC-BULLES-CARTES.md`
|
||||
|
||||
---
|
||||
|
||||
@@ -615,7 +629,7 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
||||
| 25/11/2025 | 1.0 | Création du document - Toutes les décisions initiales |
|
||||
| 09/02/2026 | 1.1 | Configuration initiale : un seul panneau Paramètres (3 sections) dans le dashboard, plus de Setup Wizard dédié ; navigation bloquée jusqu'à sauvegarde |
|
||||
| 16/06/2026 | 1.2 | Décision 5bis — familles recomposées, contournement v1.0.0 ; lien doc [28](./28_EVOLUTION-FAMILLE-ET-RESPONSABLES.md) |
|
||||
| 24/09/2026 | 1.4 | Décision 32 — Absences (`absences_garde`) ≠ Cartes ; Epic C recentré ; drop `evenements` |
|
||||
| 24/09/2026 | 1.4 | Décision 32 — Absences (`evenements_agenda`) ≠ Cartes ; Epic C recentré ; drop `evenements` |
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -98,13 +98,13 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
||||
|
||||
## Epic C — Absences + Cartes (file d’attention)
|
||||
|
||||
**Séparation :** back **`absences_garde`** = vérité métier (périodes / placement) ; module **Cartes** = collecte / bulles / workflow. Annulation = DELETE. `expire_at` dès le modèle.
|
||||
**Séparation :** back **`evenements_agenda`** = vérité métier (périodes / placement) ; module **Cartes** = collecte / bulles / workflow. Annulation = DELETE. `expire_at` dès le modèle.
|
||||
|
||||
### Back (ordre)
|
||||
|
||||
| Étape | Contenu |
|
||||
|-------|---------|
|
||||
| BDD | Table `absences_garde` + drop `evenements` |
|
||||
| BDD | Table `evenements_agenda` + drop `evenements` |
|
||||
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
||||
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
||||
| Realtime | WS/SSE bulles → **SSE** `GET /cards/stream` (#195) |
|
||||
|
||||
@@ -72,7 +72,7 @@ Bandeau : **TdB** · **Agenda** · **Contrat** · menu user (recherche AM, param
|
||||
| Maladie AM | AM | Parent **ack** (« bien reçu ») ; **aucun** doc médical |
|
||||
| Sortie / sondage | — | **Plus tard** (types optionnels) |
|
||||
|
||||
**Stockage :** table `absences_garde` (1 ligne = période, `id_placement`, `expire_at`). Les **cartes** collectent ; elles ne sont pas la source de vérité. Annulation = DELETE.
|
||||
**Stockage :** table `evenements_agenda` (1 ligne = période, `id_placement`, `expire_at`). Les **cartes** collectent ; elles ne sont pas la source de vérité. Annulation = DELETE.
|
||||
|
||||
**Péremption cartes :** mémoire courte (`retention_days` / `purge_at`) — pas un historique de vie (≠ messagerie).
|
||||
|
||||
@@ -103,7 +103,7 @@ Avec données peuplées, sur au moins 2 supports :
|
||||
|
||||
- Parent : `frontend/lib/screens/home/parent_screen/ParentDashboardScreen.dart` + `dashbord_parent/`
|
||||
- AM : `frontend/lib/screens/am/am_dashboard_screen.dart` (placeholder)
|
||||
- Cartes couleurs : `frontend/assets/cards/` (7 teintes max)
|
||||
- Cartes couleurs : `frontend/assets/cards/` (8 teintes max)
|
||||
|
||||
## 9. Ordre de build suggéré
|
||||
|
||||
|
||||
@@ -0,0 +1,195 @@
|
||||
# Mini-spec · Bulles / file d’attention (#173)
|
||||
|
||||
*Front · octobre 2026 — alignement product / API.*
|
||||
|
||||
---
|
||||
|
||||
## 1. Contexte / objectif
|
||||
|
||||
Les bulles (cartes) sont la **file d’attention** du quotidien parent / AM : décisions et infos proches (congés, arrêt maladie AM, absences, soins / bobos enfant…).
|
||||
|
||||
**Différence fondamentale avec le blog :**
|
||||
les cartes de ce fil sont des **événements d’agenda** (période, placement, historique métier loggé).
|
||||
Le **blog** = récit / mémoire narrative du jour (photos, texte) — pas une ligne d’agenda.
|
||||
|
||||
Les cartes restent une **mémoire courte** de file (`purge_at` sur la bulle) ; la **source de vérité agenda** reste le back métier.
|
||||
|
||||
Table agenda : **`evenements_agenda`** (ex-`absences_garde`, [#205](https://git.ptits-pas.fr/jmartin/petitspas/issues/205) fait) — conteneur ouvert (absences, congés, soins, école, mairie, sorties…). Les bulles notifient ; l’agenda historise.
|
||||
|
||||
Voir aussi `31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md`.
|
||||
|
||||
Cette note formalise :
|
||||
1. Ce qui est en place côté front (#173).
|
||||
2. Le contrat API (sans couleur).
|
||||
3. La **palette UI** (front only, dérivée du `type_code`).
|
||||
4. La nouvelle famille **soins / bobo enfant** (rose) — AM → parents.
|
||||
5. Idées futures.
|
||||
|
||||
---
|
||||
|
||||
## 2. Contrat API
|
||||
|
||||
Endpoint principal : `GET /api/v1/cards` (filtre couple / placement).
|
||||
|
||||
| Champ | Rôle UI |
|
||||
|-------|---------|
|
||||
| `type_code` | Layout + libellé + **couleur / icône (mapping front)** |
|
||||
| `titre` | Fallback si `type_code` inconnu |
|
||||
| `statut` | `ouverte` · `refusee` · `traitee` |
|
||||
| `response_mode` | `none` · `ack` · `accept_refuse` |
|
||||
| `is_creator` | Masque les boutons réponse pour le créateur |
|
||||
| `payload.date_debut` / `date_fin` | Période (agenda) |
|
||||
| `payload.motif` | Texte libre / détail |
|
||||
| `last_refuse_comment` | Si `refusee` |
|
||||
| `id_evenement` | Lien métier agenda (`evenements_agenda`, si applicable) — ex-`id_absence` (#205) |
|
||||
| `purge_at` | Péremption de la bulle dans la file |
|
||||
|
||||
> **Front** : parser `id_evenement` (fallback éventuel `id_absence` uniquement pour anciennes fixtures / caches). Ne plus documenter ni dépendre de `id_absence` comme contrat.
|
||||
|
||||
**Pas de champ `couleur` dans l’API.**
|
||||
La teinte pastel est **100 % front** : table de mapping `type_code` → asset (`card_*_h.png`). Le back ne gère pas la charte graphique.
|
||||
|
||||
**Règle front :** le destinataire peut répondre si `!is_creator && statut == ouverte && response_mode != none`.
|
||||
|
||||
---
|
||||
|
||||
## 3. Évolutions front déjà livrées (#173)
|
||||
|
||||
### 3.1 Feed
|
||||
|
||||
- Widget partagé `CartesFeed` (parent + AM).
|
||||
- Fond via widget `Carte` (9-slice horizontal) selon mapping local.
|
||||
- Actions via **modales** accepter / refuser / ack.
|
||||
- Libellés UI :
|
||||
- `conge_am` → « Demande de congés »
|
||||
- `arret_maladie_am` → « Arrêt maladie »
|
||||
- `absence_enfant` → « Notification d’absence »
|
||||
|
||||
### 3.2 Carte **congés** (`conge_am`)
|
||||
|
||||
| Élément | Comportement |
|
||||
|---------|----------------|
|
||||
| Fond | **Aqua** (mapping front) |
|
||||
| Encre | Pétrole `#315F63` / dates `#4A7276` |
|
||||
| Icône | Valise |
|
||||
| Période | « Du … au … » + calendrier |
|
||||
| Actions | Pilules ✓ / ✕ si `accept_refuse` |
|
||||
| Lien | « Ouvrir dans l’agenda ↗ » |
|
||||
| Opacité | Atténuée si `traitee` (sauf règle arrêt ci-dessous) |
|
||||
|
||||
### 3.3 Arrêt maladie AM (`arret_maladie_am`)
|
||||
|
||||
- Reste **visible / opaque** tant que `date_fin` (jour inclus) n’est pas passée, même si `traitee`.
|
||||
- Fond **bleu** (mapping front).
|
||||
|
||||
### 3.4 Assets
|
||||
|
||||
Teintes UI : `red` · `pink` · `peach` · `lime` · `lavender` · `green` · `blue` · `aqua`.
|
||||
Clé = **choix front**, pas une valeur API.
|
||||
|
||||
---
|
||||
|
||||
## 4. Palette UI (front only — dérivée du `type_code`)
|
||||
|
||||
| Couleur UI | Famille | Types |
|
||||
|------------|---------|--------|
|
||||
| **`aqua`** | Congés AM | `conge_am` |
|
||||
| **`blue`** | Arrêt maladie AM | `arret_maladie_am` |
|
||||
| **`peach`** | Absence enfant / info pratique | `absence_enfant` |
|
||||
| **`pink`** | Soins / bobo / problème **enfant** (AM → parents) | `soin_enfant` *(nouveau — voir §5)* |
|
||||
| **`lavender`** | Admin / divers | futurs types admin |
|
||||
|
||||
**Hors scope V1 cartes** : `absence_enfant_modif` (ack AM sur modif).
|
||||
Les **modifications d’absence** se font via l’**agenda / calendrier**, pas via une bulle dédiée. On rebranchera une notif éventuelle quand le calendrier sera implémenté.
|
||||
|
||||
**Principes**
|
||||
|
||||
- Couleur = famille visuelle (lisible sans tout lire).
|
||||
- Icône précise l’événement (surtout sur rose : thermomètre, pansement, flacon…).
|
||||
- Rose = doux / rassurant, **pas** une alerte médicale forte.
|
||||
- Congés ≠ lavande (trop « admin »).
|
||||
|
||||
---
|
||||
|
||||
## 5. Nouvelle bulle rose — soins / bobo enfant (AM → parents)
|
||||
|
||||
### Intention produit
|
||||
|
||||
La nounou signale un **événement concernant l’enfant** (maladie légère, bobo, crème, température, souci du jour…) **vers les parents**.
|
||||
|
||||
Pourquoi **pas seulement la messagerie** ?
|
||||
- C’est **loggé** dans la file d’attention.
|
||||
- C’est un **événement d’agenda** (période / jour, placement, historique).
|
||||
- Les parents peuvent **acquitter** (`ack`) sans noyer le chat.
|
||||
|
||||
### Proposition V1 (à brancher ultérieurement)
|
||||
|
||||
| | |
|
||||
|--|--|
|
||||
| `type_code` | `soin_enfant` (nom exact à figer) |
|
||||
| Émetteur | AM |
|
||||
| Destinataires | parents du couple / placement |
|
||||
| `response_mode` | `ack` |
|
||||
| Couleur UI | `pink` |
|
||||
| Back métier | ligne agenda liée (même esprit que `absences_garde` : période + placement + motif) ; la bulle = collecte / notification |
|
||||
| Payload | `date_debut` / `date_fin` (+ motif / sous-type optionnel : temperature, bobo, medicament…) |
|
||||
|
||||
**Hors scope immédiat #173** : implémentation complète ; cette section fige l’intention pour le contrat types + UI.
|
||||
|
||||
---
|
||||
|
||||
## 6. Idées futures (hors scope)
|
||||
|
||||
| Famille | Couleur UI | Exemples | `response_mode` |
|
||||
|---------|------------|----------|-----------------|
|
||||
| Soins (détail) | `pink` | `soin_temperature`, `soin_medicament`, `soin_bobo` — ou sous-types dans payload | `ack` |
|
||||
| Modif absence | `peach` | `absence_enfant_modif` — **via calendrier** d’abord ; bulle ack AM éventuelle ensuite | `ack` |
|
||||
| Sortie | `peach` / `lavender` | `sortie_a_valider` | `accept_refuse` |
|
||||
| Admin | `lavender` | `info_admin`, `document_a_fournir` | `ack` / `none` |
|
||||
|
||||
Variante soins : un seul fond rose ; l’icône / sous-type change.
|
||||
|
||||
---
|
||||
|
||||
## 7. Comportements métier à ne pas casser
|
||||
|
||||
- Créateur : pas de boutons réponse ; éventuel « En attente de réponse ».
|
||||
- Refus : afficher `last_refuse_comment`.
|
||||
- Congé : `accept_refuse` côté destinataire.
|
||||
- Absence enfant : **info seule** (`response_mode: none`) — pas de veto ni ack AM en V1.
|
||||
- Absence enfant : audience = **AM + tous les parents du foyer** (créateur + co-parent), pas seulement le déclarant.
|
||||
- Modif / édition d’absence : **agenda**, pas les cartes (V1).
|
||||
- File courte : `purge_at` ; l’**agenda** conserve l’historique métier.
|
||||
|
||||
---
|
||||
|
||||
## 8. Fichiers front de référence
|
||||
|
||||
- `frontend/lib/models/carte_bulle.dart` — mapping type → libellé / icône / fond
|
||||
- `frontend/lib/widgets/quotidien/cartes_feed.dart`
|
||||
- `frontend/lib/models/card_assets.dart`
|
||||
- Assets : `frontend/assets/cards/`, `valise.png`, `btn_*_pilule.png`
|
||||
|
||||
---
|
||||
|
||||
## 9. Recettes
|
||||
|
||||
- [ ] API cartes **sans** champ `couleur` (ni feed ni `/types`).
|
||||
- [ ] Contrat lien agenda : champ API `id_evenement` (plus `id_absence`).
|
||||
- [ ] Front mappe `conge_am` → aqua, `arret_maladie_am` → blue, `absence_enfant` → peach.
|
||||
- [ ] Accept / refuse congé OK.
|
||||
- [ ] Arrêt : ack parent « Bien reçu » ; traité + période en cours → reste visible.
|
||||
- [ ] Absence enfant : pas de bouton (info).
|
||||
- [ ] Filtre couple / placement.
|
||||
- [ ] (Plus tard) `soin_enfant` rose AM → parents + ligne agenda.
|
||||
- [ ] (Plus tard / calendrier) modifs d’absence + éventuel `absence_enfant_modif`.
|
||||
|
||||
---
|
||||
|
||||
## 10. Références
|
||||
|
||||
- Ticket front : **#173**
|
||||
- Module cartes : **#194**
|
||||
- Quotidien : `docs/31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md`
|
||||
- Décision projet : `docs/24_DECISIONS-PROJET.md` §32
|
||||
- Maquette congés : `ressources/bulle_congés.jpg`
|
||||
|
After Width: | Height: | Size: 741 KiB |
|
After Width: | Height: | Size: 692 KiB |
|
After Width: | Height: | Size: 195 KiB |
|
After Width: | Height: | Size: 231 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 591 KiB |
|
Before Width: | Height: | Size: 683 KiB |
|
Before Width: | Height: | Size: 659 KiB |
|
Before Width: | Height: | Size: 268 KiB |
|
After Width: | Height: | Size: 289 KiB |
|
After Width: | Height: | Size: 291 KiB |
|
After Width: | Height: | Size: 365 KiB |
@@ -1,5 +1,3 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
enum CardColorVertical {
|
||||
red('assets/cards/card_red.png'),
|
||||
pink('assets/cards/card_pink.png'),
|
||||
@@ -7,7 +5,8 @@ enum CardColorVertical {
|
||||
lime('assets/cards/card_lime.png'),
|
||||
lavender('assets/cards/card_lavender.png'),
|
||||
green('assets/cards/card_green.png'),
|
||||
blue('assets/cards/card_blue.png');
|
||||
blue('assets/cards/card_blue.png'),
|
||||
aqua('assets/cards/card_aqua.png');
|
||||
|
||||
final String path;
|
||||
const CardColorVertical(this.path);
|
||||
@@ -20,7 +19,8 @@ enum CardColorHorizontal {
|
||||
lime('assets/cards/card_lime_h.png'),
|
||||
lavender('assets/cards/card_lavender_h.png'),
|
||||
green('assets/cards/card_green_h.png'),
|
||||
blue('assets/cards/card_blue_h.png');
|
||||
blue('assets/cards/card_blue_h.png'),
|
||||
aqua('assets/cards/card_aqua_h.png');
|
||||
|
||||
final String path;
|
||||
const CardColorHorizontal(this.path);
|
||||
|
||||
@@ -49,7 +49,6 @@ class CarteBulle {
|
||||
final String id;
|
||||
final String typeCode;
|
||||
final String titre;
|
||||
final String? couleur;
|
||||
final String idPlacement;
|
||||
final String? idAbsence;
|
||||
final String operation;
|
||||
@@ -67,7 +66,6 @@ class CarteBulle {
|
||||
required this.id,
|
||||
required this.typeCode,
|
||||
required this.titre,
|
||||
this.couleur,
|
||||
required this.idPlacement,
|
||||
this.idAbsence,
|
||||
this.operation = 'create',
|
||||
@@ -86,6 +84,15 @@ class CarteBulle {
|
||||
String? get dateFin => payload['date_fin']?.toString();
|
||||
String? get motif => payload['motif']?.toString();
|
||||
|
||||
/// Motif de refus : réponse API, sinon motif payload (co-parent / reload).
|
||||
String? get motifRefus {
|
||||
final fromResponse = lastRefuseComment?.trim();
|
||||
if (fromResponse != null && fromResponse.isNotEmpty) return fromResponse;
|
||||
final fromPayload = motif?.trim();
|
||||
if (fromPayload != null && fromPayload.isNotEmpty) return fromPayload;
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Libellé UI (sémantique produit) — pas le titre brut API.
|
||||
String get titreAffiche {
|
||||
switch (typeCode) {
|
||||
@@ -96,6 +103,8 @@ class CarteBulle {
|
||||
case 'absence_enfant':
|
||||
case 'absence_enfant_modif':
|
||||
return 'Notification d’absence';
|
||||
case 'soin_enfant':
|
||||
return 'Soin / bobo';
|
||||
default:
|
||||
return titre;
|
||||
}
|
||||
@@ -103,17 +112,19 @@ class CarteBulle {
|
||||
|
||||
bool get isArretMaladie => typeCode == 'arret_maladie_am';
|
||||
bool get isCongeAm => typeCode == 'conge_am';
|
||||
bool get isSoinEnfant => typeCode == 'soin_enfant';
|
||||
|
||||
/// Icône dessin (haut droite) selon le type de bulle.
|
||||
String? get iconAsset {
|
||||
switch (typeCode) {
|
||||
case 'conge_am':
|
||||
return 'assets/images/cartes/icon_carte_conges2.png';
|
||||
return 'assets/images/valise.png';
|
||||
case 'arret_maladie_am':
|
||||
return 'assets/images/cartes/icon_carte_maladie.png';
|
||||
return 'assets/images/thermo_croix.png';
|
||||
case 'absence_enfant':
|
||||
case 'absence_enfant_modif':
|
||||
return 'assets/images/cartes/icon_carte_absence.png';
|
||||
return 'assets/images/sac_lapin.png';
|
||||
// soin_enfant : icône selon sous-type payload — à brancher plus tard
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
@@ -137,29 +148,27 @@ class CarteBulle {
|
||||
return !todayDay.isAfter(fin);
|
||||
}
|
||||
|
||||
/// Asset horizontal pastel (palette `assets/cards/` uniquement).
|
||||
String get backgroundAsset {
|
||||
final key = (couleur ?? '').trim().toLowerCase();
|
||||
switch (key) {
|
||||
case 'red':
|
||||
return CardColorHorizontal.red.path;
|
||||
case 'pink':
|
||||
return CardColorHorizontal.pink.path;
|
||||
case 'peach':
|
||||
return CardColorHorizontal.peach.path;
|
||||
case 'lime':
|
||||
return CardColorHorizontal.lime.path;
|
||||
case 'lavender':
|
||||
return CardColorHorizontal.lavender.path;
|
||||
case 'green':
|
||||
return CardColorHorizontal.green.path;
|
||||
case 'blue':
|
||||
return CardColorHorizontal.blue.path;
|
||||
/// Teinte pastel UI dérivée du `type_code` (pas de `couleur` API).
|
||||
/// Voir `docs/32_MINI-SPEC-BULLES-CARTES.md` §4.
|
||||
CardColorHorizontal get colorFamily {
|
||||
switch (typeCode) {
|
||||
case 'conge_am':
|
||||
return CardColorHorizontal.aqua;
|
||||
case 'arret_maladie_am':
|
||||
return CardColorHorizontal.blue;
|
||||
case 'absence_enfant':
|
||||
case 'absence_enfant_modif':
|
||||
return CardColorHorizontal.peach;
|
||||
case 'soin_enfant':
|
||||
return CardColorHorizontal.pink;
|
||||
default:
|
||||
return CardColorHorizontal.peach.path;
|
||||
return CardColorHorizontal.lavender;
|
||||
}
|
||||
}
|
||||
|
||||
/// Asset horizontal pastel (palette `assets/cards/` uniquement).
|
||||
String get backgroundAsset => colorFamily.path;
|
||||
|
||||
/// Le destinataire peut répondre (pas le créateur, carte ouverte).
|
||||
bool get peutRepondre =>
|
||||
!isCreator &&
|
||||
@@ -172,7 +181,6 @@ class CarteBulle {
|
||||
id: (json['id'] ?? '').toString(),
|
||||
typeCode: (json['type_code'] ?? '').toString(),
|
||||
titre: (json['titre'] ?? json['type_code'] ?? 'Carte').toString(),
|
||||
couleur: json['couleur']?.toString(),
|
||||
idPlacement: (json['id_placement'] ?? '').toString(),
|
||||
idAbsence: json['id_absence']?.toString(),
|
||||
operation: (json['operation'] ?? 'create').toString(),
|
||||
|
||||
@@ -41,6 +41,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
|
||||
CardColorVertical.red,
|
||||
CardColorVertical.green,
|
||||
CardColorVertical.blue,
|
||||
CardColorVertical.aqua,
|
||||
];
|
||||
|
||||
// Garder une trace des couleurs déjà utilisées
|
||||
|
||||
@@ -10,7 +10,7 @@ class AbsencesGardeService {
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse(ApiConfig.baseUrl +
|
||||
'/absences-garde' +
|
||||
'/evenements-agenda' +
|
||||
(placementId != null ? '?placementId=$placementId' : ''));
|
||||
|
||||
final res = await http.get(uri, headers: headers);
|
||||
@@ -33,7 +33,7 @@ class AbsencesGardeService {
|
||||
final token = await TokenService.getToken();
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde');
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/evenements-agenda');
|
||||
final res = await http.post(
|
||||
uri,
|
||||
headers: headers,
|
||||
@@ -62,7 +62,7 @@ class AbsencesGardeService {
|
||||
final token = await TokenService.getToken();
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/evenements-agenda/$id');
|
||||
final Map<String, dynamic> body = {};
|
||||
if (dateDebut != null) body['date_debut'] = dateDebut;
|
||||
if (dateFin != null) body['date_fin'] = dateFin;
|
||||
@@ -85,7 +85,7 @@ class AbsencesGardeService {
|
||||
final token = await TokenService.getToken();
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/evenements-agenda/$id');
|
||||
final res = await http.delete(uri, headers: headers);
|
||||
if (res.statusCode != 204) {
|
||||
throw Exception("Erreur de suppression d'absence : ${res.statusCode}");
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:p_tits_pas/models/carte_bulle.dart';
|
||||
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||
import 'package:p_tits_pas/services/api/tokenService.dart';
|
||||
|
||||
import 'cards_stream_connector_stub.dart'
|
||||
if (dart.library.html) 'cards_stream_connector_web.dart'
|
||||
if (dart.library.io) 'cards_stream_connector_io.dart';
|
||||
|
||||
/// Événement temps réel file d'attention — ticket #195.
|
||||
class CardsStreamEvent {
|
||||
final String type;
|
||||
final String? cardId;
|
||||
final CarteBulle? card;
|
||||
|
||||
const CardsStreamEvent({
|
||||
required this.type,
|
||||
this.cardId,
|
||||
this.card,
|
||||
});
|
||||
}
|
||||
|
||||
/// Client SSE `GET /cards/stream` avec reconnexion.
|
||||
class CardsStreamClient {
|
||||
final void Function(CardsStreamEvent event) onEvent;
|
||||
final VoidCallback? onReconnectSync;
|
||||
|
||||
CardsStreamClient({
|
||||
required this.onEvent,
|
||||
this.onReconnectSync,
|
||||
});
|
||||
|
||||
final CardsStreamConnector _connector = CardsStreamConnector();
|
||||
bool _started = false;
|
||||
bool _stopRequested = false;
|
||||
int _attempt = 0;
|
||||
Timer? _retryTimer;
|
||||
bool _hadConnection = false;
|
||||
|
||||
void start() {
|
||||
if (_started) return;
|
||||
_started = true;
|
||||
_stopRequested = false;
|
||||
_attempt = 0;
|
||||
unawaited(_connect());
|
||||
}
|
||||
|
||||
void stop() {
|
||||
_stopRequested = true;
|
||||
_started = false;
|
||||
_retryTimer?.cancel();
|
||||
_retryTimer = null;
|
||||
_connector.close();
|
||||
}
|
||||
|
||||
Future<void> _connect() async {
|
||||
if (_stopRequested) return;
|
||||
|
||||
final token = await TokenService.getToken();
|
||||
if (token == null || token.isEmpty) {
|
||||
_scheduleRetry();
|
||||
return;
|
||||
}
|
||||
|
||||
final base =
|
||||
'${ApiConfig.baseUrl}${ApiConfig.cardsStream}'.replaceAll(
|
||||
RegExp(r'/+$'),
|
||||
'',
|
||||
);
|
||||
|
||||
// Web (EventSource) : token en query. IO : Bearer dans le connecteur.
|
||||
final url = kIsWeb
|
||||
? Uri.parse(base).replace(
|
||||
queryParameters: {'access_token': token},
|
||||
).toString()
|
||||
: base;
|
||||
|
||||
await _connector.connect(
|
||||
url: url,
|
||||
bearerToken: kIsWeb ? null : token,
|
||||
onEvent: _handleRaw,
|
||||
onError: (_) {
|
||||
if (_stopRequested) return;
|
||||
_connector.close();
|
||||
_scheduleRetry();
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
void _handleRaw(String eventType, String data) {
|
||||
if (_stopRequested) return;
|
||||
|
||||
// Premier événement (souvent heartbeat) = connexion OK.
|
||||
if (!_hadConnection) {
|
||||
_hadConnection = true;
|
||||
_attempt = 0;
|
||||
} else if (eventType == 'heartbeat') {
|
||||
_attempt = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (eventType == 'heartbeat') return;
|
||||
|
||||
try {
|
||||
final decoded = jsonDecode(data);
|
||||
if (decoded is! Map) return;
|
||||
final map = Map<String, dynamic>.from(decoded);
|
||||
final type = (map['event']?.toString().isNotEmpty == true)
|
||||
? map['event'].toString()
|
||||
: eventType;
|
||||
final cardId = map['card_id']?.toString();
|
||||
final payload = map['data'];
|
||||
|
||||
CarteBulle? card;
|
||||
if (type == 'response.added' && payload is Map) {
|
||||
final nested = payload['card'];
|
||||
if (nested is Map) {
|
||||
card = CarteBulle.fromJson(Map<String, dynamic>.from(nested));
|
||||
}
|
||||
} else if ((type == 'card.created' || type == 'card.updated') &&
|
||||
payload is Map) {
|
||||
card = CarteBulle.fromJson(Map<String, dynamic>.from(payload));
|
||||
}
|
||||
|
||||
onEvent(
|
||||
CardsStreamEvent(
|
||||
type: type,
|
||||
cardId: cardId ?? card?.id,
|
||||
card: card,
|
||||
),
|
||||
);
|
||||
} catch (_) {
|
||||
// Événement mal formé : ignorer.
|
||||
}
|
||||
}
|
||||
|
||||
void _scheduleRetry() {
|
||||
if (_stopRequested) return;
|
||||
_retryTimer?.cancel();
|
||||
final delaySec = (1 << _attempt.clamp(0, 4)).clamp(1, 30);
|
||||
_attempt++;
|
||||
_retryTimer = Timer(Duration(seconds: delaySec), () {
|
||||
if (_stopRequested) return;
|
||||
if (_hadConnection) {
|
||||
// Resync REST après coupure pour ne pas manquer d'événements.
|
||||
onReconnectSync?.call();
|
||||
}
|
||||
unawaited(_connect());
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
/// Connecteur SSE via HTTP stream (IO / mobile) — ticket #195.
|
||||
class CardsStreamConnector {
|
||||
http.Client? _client;
|
||||
StreamSubscription<List<int>>? _sub;
|
||||
bool _closed = false;
|
||||
|
||||
Future<void> connect({
|
||||
required String url,
|
||||
String? bearerToken,
|
||||
required void Function(String eventType, String data) onEvent,
|
||||
required void Function(Object error) onError,
|
||||
}) async {
|
||||
close();
|
||||
_closed = false;
|
||||
final client = http.Client();
|
||||
_client = client;
|
||||
|
||||
try {
|
||||
final request = http.Request('GET', Uri.parse(url));
|
||||
request.headers['Accept'] = 'text/event-stream';
|
||||
request.headers['Cache-Control'] = 'no-cache';
|
||||
if (bearerToken != null && bearerToken.isNotEmpty) {
|
||||
request.headers['Authorization'] = 'Bearer $bearerToken';
|
||||
}
|
||||
|
||||
final response = await client.send(request);
|
||||
if (response.statusCode != 200) {
|
||||
onError(
|
||||
StateError('SSE cards HTTP ${response.statusCode}'),
|
||||
);
|
||||
close();
|
||||
return;
|
||||
}
|
||||
|
||||
String? eventType;
|
||||
final dataBuf = StringBuffer();
|
||||
final lineBuf = StringBuffer();
|
||||
|
||||
void flushEvent() {
|
||||
if (dataBuf.isEmpty) {
|
||||
eventType = null;
|
||||
return;
|
||||
}
|
||||
onEvent(eventType ?? 'message', dataBuf.toString());
|
||||
dataBuf.clear();
|
||||
eventType = null;
|
||||
}
|
||||
|
||||
void handleLine(String line) {
|
||||
if (line.isEmpty) {
|
||||
flushEvent();
|
||||
return;
|
||||
}
|
||||
if (line.startsWith(':')) return;
|
||||
if (line.startsWith('event:')) {
|
||||
eventType = line.substring(6).trim();
|
||||
return;
|
||||
}
|
||||
if (line.startsWith('data:')) {
|
||||
final payload = line.length > 5 ? line.substring(5) : '';
|
||||
final trimmed = payload.startsWith(' ')
|
||||
? payload.substring(1)
|
||||
: payload;
|
||||
if (dataBuf.isNotEmpty) dataBuf.write('\n');
|
||||
dataBuf.write(trimmed);
|
||||
}
|
||||
}
|
||||
|
||||
_sub = response.stream.listen(
|
||||
(chunk) {
|
||||
if (_closed) return;
|
||||
lineBuf.write(utf8.decode(chunk, allowMalformed: true));
|
||||
var content = lineBuf.toString();
|
||||
var idx = content.indexOf('\n');
|
||||
while (idx >= 0) {
|
||||
var line = content.substring(0, idx);
|
||||
if (line.endsWith('\r')) {
|
||||
line = line.substring(0, line.length - 1);
|
||||
}
|
||||
handleLine(line);
|
||||
content = content.substring(idx + 1);
|
||||
idx = content.indexOf('\n');
|
||||
}
|
||||
lineBuf
|
||||
..clear()
|
||||
..write(content);
|
||||
},
|
||||
onError: (Object e) {
|
||||
if (!_closed) onError(e);
|
||||
},
|
||||
onDone: () {
|
||||
if (!_closed) onError(StateError('SSE cards fermé'));
|
||||
},
|
||||
cancelOnError: true,
|
||||
);
|
||||
} catch (e) {
|
||||
if (!_closed) onError(e);
|
||||
close();
|
||||
}
|
||||
}
|
||||
|
||||
void close() {
|
||||
_closed = true;
|
||||
_sub?.cancel();
|
||||
_sub = null;
|
||||
_client?.close();
|
||||
_client = null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
import 'dart:async';
|
||||
|
||||
/// Connecteur SSE — stub (tests / plateformes sans impl).
|
||||
class CardsStreamConnector {
|
||||
Future<void> connect({
|
||||
required String url,
|
||||
String? bearerToken,
|
||||
required void Function(String eventType, String data) onEvent,
|
||||
required void Function(Object error) onError,
|
||||
}) async {}
|
||||
|
||||
void close() {}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
// Connecteur web uniquement (import conditionnel).
|
||||
// ignore_for_file: avoid_web_libraries_in_flutter, deprecated_member_use
|
||||
|
||||
import 'dart:html' as html;
|
||||
|
||||
/// Connecteur SSE navigateur (EventSource) — ticket #195.
|
||||
/// Auth via `?access_token=` (EventSource ne permet pas Authorization).
|
||||
class CardsStreamConnector {
|
||||
html.EventSource? _source;
|
||||
final Map<String, html.EventListener> _listeners = {};
|
||||
|
||||
Future<void> connect({
|
||||
required String url,
|
||||
String? bearerToken,
|
||||
required void Function(String eventType, String data) onEvent,
|
||||
required void Function(Object error) onError,
|
||||
}) async {
|
||||
close();
|
||||
final source = html.EventSource(url);
|
||||
_source = source;
|
||||
|
||||
const names = [
|
||||
'card.created',
|
||||
'card.updated',
|
||||
'card.deleted',
|
||||
'response.added',
|
||||
'heartbeat',
|
||||
];
|
||||
for (final name in names) {
|
||||
void listener(html.Event raw) {
|
||||
final msg = raw as html.MessageEvent;
|
||||
final data = msg.data?.toString() ?? '';
|
||||
if (data.isEmpty) return;
|
||||
onEvent(name, data);
|
||||
}
|
||||
|
||||
_listeners[name] = listener;
|
||||
source.addEventListener(name, listener);
|
||||
}
|
||||
|
||||
void onErr(html.Event _) {
|
||||
onError(StateError('SSE cards déconnecté'));
|
||||
}
|
||||
|
||||
_listeners['error'] = onErr;
|
||||
source.addEventListener('error', onErr);
|
||||
}
|
||||
|
||||
void close() {
|
||||
final source = _source;
|
||||
if (source != null) {
|
||||
_listeners.forEach((name, listener) {
|
||||
source.removeEventListener(name, listener);
|
||||
});
|
||||
source.close();
|
||||
}
|
||||
_listeners.clear();
|
||||
_source = null;
|
||||
}
|
||||
}
|
||||
@@ -17,6 +17,7 @@ class RepriseMapper {
|
||||
CardColorVertical.red,
|
||||
CardColorVertical.green,
|
||||
CardColorVertical.blue,
|
||||
CardColorVertical.aqua,
|
||||
];
|
||||
|
||||
static ParentData parentFromDossier(ParentDossier p) {
|
||||
|
||||
@@ -185,6 +185,8 @@ class BaseFormScreen extends StatelessWidget {
|
||||
return CardColorVertical.pink.path;
|
||||
case CardColorHorizontal.red:
|
||||
return CardColorVertical.red.path;
|
||||
case CardColorHorizontal.aqua:
|
||||
return CardColorVertical.aqua.path;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -205,9 +205,14 @@ class _ChildCardWidgetState extends State<ChildCardWidget> {
|
||||
);
|
||||
}
|
||||
|
||||
final Color baseCardColorForShadow = widget.childData.cardColor == CardColorVertical.lavender
|
||||
? Colors.purple.shade200
|
||||
: (widget.childData.cardColor == CardColorVertical.pink ? Colors.pink.shade200 : Colors.grey.shade200);
|
||||
final Color baseCardColorForShadow =
|
||||
widget.childData.cardColor == CardColorVertical.lavender
|
||||
? Colors.purple.shade200
|
||||
: (widget.childData.cardColor == CardColorVertical.pink
|
||||
? Colors.pink.shade200
|
||||
: (widget.childData.cardColor == CardColorVertical.aqua
|
||||
? Colors.teal.shade200
|
||||
: Colors.grey.shade200));
|
||||
final double photoSide = 200.0 * (config.isMobile ? 0.8 : 1.0);
|
||||
final double editableCardWidth = config.isMobile
|
||||
? double.infinity
|
||||
@@ -340,6 +345,7 @@ class _ChildCardWidgetState extends State<ChildCardWidget> {
|
||||
|
||||
// Mapping manuel simple
|
||||
if (widget.childData.cardColor.path.contains('lavender')) horizontalCardAsset = CardColorHorizontal.lavender.path;
|
||||
else if (widget.childData.cardColor.path.contains('aqua')) horizontalCardAsset = CardColorHorizontal.aqua.path;
|
||||
else if (widget.childData.cardColor.path.contains('blue')) horizontalCardAsset = CardColorHorizontal.blue.path;
|
||||
else if (widget.childData.cardColor.path.contains('green')) horizontalCardAsset = CardColorHorizontal.green.path;
|
||||
else if (widget.childData.cardColor.path.contains('lime')) horizontalCardAsset = CardColorHorizontal.lime.path;
|
||||
|
||||
@@ -1302,6 +1302,8 @@ class _PersonalInfoFormScreenState extends State<PersonalInfoFormScreen> {
|
||||
return CardColorVertical.pink.path;
|
||||
case CardColorHorizontal.red:
|
||||
return CardColorVertical.red.path;
|
||||
case CardColorHorizontal.aqua:
|
||||
return CardColorVertical.aqua.path;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -642,6 +642,8 @@ class _PresentationFormScreenState extends State<PresentationFormScreen> {
|
||||
return CardColorVertical.pink.path;
|
||||
case CardColorHorizontal.red:
|
||||
return CardColorVertical.red.path;
|
||||
case CardColorHorizontal.aqua:
|
||||
return CardColorVertical.aqua.path;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1196,6 +1196,8 @@ class _ProfessionalInfoFormScreenState extends State<ProfessionalInfoFormScreen>
|
||||
return CardColorVertical.pink.path;
|
||||
case CardColorHorizontal.red:
|
||||
return CardColorVertical.red.path;
|
||||
case CardColorHorizontal.aqua:
|
||||
return CardColorVertical.aqua.path;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:p_tits_pas/models/card_assets.dart';
|
||||
import 'package:p_tits_pas/models/carte_bulle.dart';
|
||||
import 'package:p_tits_pas/services/api/cards_service.dart';
|
||||
import 'package:p_tits_pas/services/api/cards_stream_client.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/carte.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||
|
||||
@@ -22,15 +24,35 @@ class CartesFeed extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _CartesFeedState extends State<CartesFeed> {
|
||||
static const double _fadeExtent = 0.08;
|
||||
|
||||
List<CarteBulle> _items = const [];
|
||||
bool _loading = true;
|
||||
String? _error;
|
||||
String? _busyCardId;
|
||||
|
||||
final ScrollController _scrollController = ScrollController();
|
||||
bool _isScrollable = false;
|
||||
bool _fadeTop = false;
|
||||
bool _fadeBottom = false;
|
||||
|
||||
CardsStreamClient? _stream;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_scrollController.addListener(_syncScrollFades);
|
||||
_load();
|
||||
_startStream();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_stream?.stop();
|
||||
_stream = null;
|
||||
_scrollController.removeListener(_syncScrollFades);
|
||||
_scrollController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -41,6 +63,104 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
}
|
||||
}
|
||||
|
||||
void _startStream() {
|
||||
_stream?.stop();
|
||||
_stream = CardsStreamClient(
|
||||
onEvent: _onStreamEvent,
|
||||
onReconnectSync: () {
|
||||
if (mounted) _load();
|
||||
},
|
||||
)..start();
|
||||
}
|
||||
|
||||
void _onStreamEvent(CardsStreamEvent event) {
|
||||
if (!mounted) return;
|
||||
if (event.type == 'heartbeat') return;
|
||||
|
||||
if (event.type == 'card.deleted') {
|
||||
final id = event.cardId;
|
||||
if (id == null || id.isEmpty) return;
|
||||
setState(() {
|
||||
_items = _trier([
|
||||
for (final c in _items)
|
||||
if (c.id != id) c,
|
||||
]);
|
||||
});
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _syncScrollFades());
|
||||
return;
|
||||
}
|
||||
|
||||
final card = event.card;
|
||||
if (card == null) return;
|
||||
|
||||
final filter = widget.placementId;
|
||||
final matchesFilter = filter == null ||
|
||||
filter.isEmpty ||
|
||||
card.idPlacement == filter;
|
||||
|
||||
setState(() {
|
||||
if (!matchesFilter) {
|
||||
_items = _trier([
|
||||
for (final c in _items)
|
||||
if (c.id != card.id) c,
|
||||
]);
|
||||
} else if (_items.any((c) => c.id == card.id)) {
|
||||
_items = _trier([
|
||||
for (final c in _items) if (c.id == card.id) card else c,
|
||||
]);
|
||||
} else {
|
||||
_items = _trier([..._items, card]);
|
||||
}
|
||||
});
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _syncScrollFades());
|
||||
}
|
||||
|
||||
void _syncScrollFades() {
|
||||
if (!_scrollController.hasClients) return;
|
||||
final position = _scrollController.position;
|
||||
final scrollable = position.maxScrollExtent > 0.0;
|
||||
final threshold = position.viewportDimension * _fadeExtent / 2;
|
||||
final fadeTop = scrollable && position.pixels > threshold;
|
||||
final fadeBottom = scrollable &&
|
||||
position.pixels < (position.maxScrollExtent - threshold);
|
||||
if (scrollable != _isScrollable ||
|
||||
fadeTop != _fadeTop ||
|
||||
fadeBottom != _fadeBottom) {
|
||||
setState(() {
|
||||
_isScrollable = scrollable;
|
||||
_fadeTop = fadeTop;
|
||||
_fadeBottom = fadeBottom;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// Aligné sur le tri API : refusées → ouvertes → traitées, puis
|
||||
/// `modifie_le` DESC, `id` en départage (ordre stable entre parents).
|
||||
static List<CarteBulle> _trier(List<CarteBulle> items) {
|
||||
int rang(CarteStatut s) {
|
||||
switch (s) {
|
||||
case CarteStatut.refusee:
|
||||
return 0;
|
||||
case CarteStatut.ouverte:
|
||||
return 1;
|
||||
case CarteStatut.traitee:
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
final out = List<CarteBulle>.from(items);
|
||||
out.sort((a, b) {
|
||||
final byStatut = rang(a.statut).compareTo(rang(b.statut));
|
||||
if (byStatut != 0) return byStatut;
|
||||
final am = a.modifieLe?.millisecondsSinceEpoch ?? 0;
|
||||
final bm = b.modifieLe?.millisecondsSinceEpoch ?? 0;
|
||||
final byModif = bm.compareTo(am); // DESC
|
||||
if (byModif != 0) return byModif;
|
||||
return a.id.compareTo(b.id);
|
||||
});
|
||||
return out;
|
||||
}
|
||||
|
||||
Future<void> _load() async {
|
||||
setState(() {
|
||||
_loading = true;
|
||||
@@ -52,9 +172,10 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_items = items;
|
||||
_items = _trier(items);
|
||||
_loading = false;
|
||||
});
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _syncScrollFades());
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
@@ -78,9 +199,9 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_items = [
|
||||
_items = _trier([
|
||||
for (final c in _items) if (c.id == updated.id) updated else c,
|
||||
];
|
||||
]);
|
||||
_busyCardId = null;
|
||||
});
|
||||
} catch (e) {
|
||||
@@ -103,8 +224,10 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
|
||||
),
|
||||
content: Text(
|
||||
'Confirmez-vous l’acceptation de « ${card.titreAffiche} » '
|
||||
'(${_periodeCourte(card)}) ?',
|
||||
card.isCongeAm
|
||||
? 'Confirmez-vous les congés ${_periodeDuAu(card)} ?'
|
||||
: 'Confirmez-vous l’acceptation de « ${card.titreAffiche} » '
|
||||
'(${_periodeCourte(card)}) ?',
|
||||
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
|
||||
),
|
||||
actions: [
|
||||
@@ -124,89 +247,39 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onAck(CarteBulle card) async {
|
||||
final ok = await showDialog<bool>(
|
||||
/// Ack immédiat (arrêt maladie, etc.) — pas de modale : un clic = bien reçu.
|
||||
Future<void> _onAck(CarteBulle card) => _respond(card, action: 'ack');
|
||||
|
||||
Future<void> _onRefuse(CarteBulle card) async {
|
||||
final comment = await showDialog<String>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
title: Text(
|
||||
'Prise en compte',
|
||||
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
|
||||
),
|
||||
content: Text(
|
||||
'Confirmez-vous avoir bien reçu cet arrêt maladie '
|
||||
'(${_periodeCourte(card)}) ?',
|
||||
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(ctx, false),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.pop(ctx, true),
|
||||
child: const Text('Bien reçu'),
|
||||
),
|
||||
],
|
||||
builder: (ctx) => _RefuseDialog(
|
||||
title: card.isCongeAm ? 'Refuser les congés ?' : 'Refuser la demande',
|
||||
message: card.isCongeAm
|
||||
? 'Indiquez le motif du refus des congés '
|
||||
'${_periodeDuAu(card)}.'
|
||||
: 'Indiquez le motif du refus pour « ${card.titreAffiche} ».',
|
||||
),
|
||||
);
|
||||
if (ok == true) {
|
||||
await _respond(card, action: 'ack');
|
||||
if (comment != null && comment.isNotEmpty) {
|
||||
await _respond(card, action: 'refuse', comment: comment);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onRefuse(CarteBulle card) async {
|
||||
final controller = TextEditingController();
|
||||
final ok = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
title: Text(
|
||||
'Refuser la demande',
|
||||
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
|
||||
),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text(
|
||||
'Indiquez le motif du refus pour « ${card.titreAffiche} ».',
|
||||
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextField(
|
||||
controller: controller,
|
||||
maxLines: 3,
|
||||
autofocus: true,
|
||||
decoration: const InputDecoration(
|
||||
hintText: 'Motif du refus…',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(ctx, false),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () {
|
||||
if (controller.text.trim().isEmpty) return;
|
||||
Navigator.pop(ctx, true);
|
||||
},
|
||||
child: const Text('Refuser'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (ok == true && controller.text.trim().isNotEmpty) {
|
||||
await _respond(
|
||||
card,
|
||||
action: 'refuse',
|
||||
comment: controller.text.trim(),
|
||||
);
|
||||
}
|
||||
controller.dispose();
|
||||
}
|
||||
static const _mois = [
|
||||
'janvier',
|
||||
'février',
|
||||
'mars',
|
||||
'avril',
|
||||
'mai',
|
||||
'juin',
|
||||
'juillet',
|
||||
'août',
|
||||
'septembre',
|
||||
'octobre',
|
||||
'novembre',
|
||||
'décembre',
|
||||
];
|
||||
|
||||
static String _periodeCourte(CarteBulle card) {
|
||||
final d = card.dateDebut;
|
||||
@@ -223,6 +296,23 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
return '${fmt(d)} → ${fmt(f)}';
|
||||
}
|
||||
|
||||
/// « du 04 novembre 2026 au 06 novembre 2026 »
|
||||
static String _periodeDuAu(CarteBulle card) {
|
||||
String fmtLong(String? iso) {
|
||||
if (iso == null || iso.isEmpty) return '…';
|
||||
final dt = DateTime.tryParse(iso);
|
||||
if (dt == null) return iso;
|
||||
final jj = dt.day.toString().padLeft(2, '0');
|
||||
return '$jj ${_mois[dt.month - 1]} ${dt.year}';
|
||||
}
|
||||
|
||||
final d = card.dateDebut;
|
||||
final f = card.dateFin;
|
||||
if (d == null && f == null) return 'pour une période non précisée';
|
||||
if (d != null && (f == null || d == f)) return 'du ${fmtLong(d)}';
|
||||
return 'du ${fmtLong(d)} au ${fmtLong(f)}';
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
@@ -304,27 +394,124 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
);
|
||||
}
|
||||
|
||||
return RefreshIndicator(
|
||||
onRefresh: _load,
|
||||
child: ListView.separated(
|
||||
padding: const EdgeInsets.only(bottom: 8),
|
||||
itemCount: _items.length,
|
||||
separatorBuilder: (_, __) => const SizedBox(height: 10),
|
||||
itemBuilder: (context, index) {
|
||||
final card = _items[index];
|
||||
return _BulleTile(
|
||||
card: card,
|
||||
busy: _busyCardId == card.id,
|
||||
onAccept: () => _onAccept(card),
|
||||
onAck: () => _onAck(card),
|
||||
onRefuse: () => _onRefuse(card),
|
||||
);
|
||||
return NotificationListener<ScrollMetricsNotification>(
|
||||
onNotification: (_) {
|
||||
_syncScrollFades();
|
||||
return false;
|
||||
},
|
||||
child: ShaderMask(
|
||||
blendMode: BlendMode.dstIn,
|
||||
shaderCallback: (Rect bounds) {
|
||||
final stops = <double>[
|
||||
0.0,
|
||||
_fadeExtent,
|
||||
1.0 - _fadeExtent,
|
||||
1.0,
|
||||
];
|
||||
if (!_isScrollable) {
|
||||
return const LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: <Color>[
|
||||
Colors.black,
|
||||
Colors.black,
|
||||
Colors.black,
|
||||
Colors.black,
|
||||
],
|
||||
stops: [0.0, 0.08, 0.92, 1.0],
|
||||
).createShader(bounds);
|
||||
}
|
||||
final topMask = _fadeTop ? Colors.transparent : Colors.black;
|
||||
final bottomMask = _fadeBottom ? Colors.transparent : Colors.black;
|
||||
return LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: <Color>[
|
||||
topMask,
|
||||
Colors.black,
|
||||
Colors.black,
|
||||
bottomMask,
|
||||
],
|
||||
stops: stops,
|
||||
).createShader(bounds);
|
||||
},
|
||||
child: RefreshIndicator(
|
||||
onRefresh: _load,
|
||||
child: ListView.separated(
|
||||
controller: _scrollController,
|
||||
padding: const EdgeInsets.only(top: 4, bottom: 8),
|
||||
itemCount: _items.length,
|
||||
separatorBuilder: (_, __) => const SizedBox(height: 10),
|
||||
itemBuilder: (context, index) {
|
||||
final card = _items[index];
|
||||
return _BulleTile(
|
||||
card: card,
|
||||
busy: _busyCardId == card.id,
|
||||
onAccept: () => _onAccept(card),
|
||||
onAck: () => _onAck(card),
|
||||
onRefuse: () => _onRefuse(card),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Encre (titre / date / lien) accordée à la teinte de fond de la bulle.
|
||||
class _Encre {
|
||||
final Color ink;
|
||||
final Color date;
|
||||
final Color link;
|
||||
const _Encre(this.ink, this.date, this.link);
|
||||
|
||||
/// Aqua → pétrole désaturé ; pêche → brun chaud ; bleu → marine doux ;
|
||||
/// rose → bois de rose ; lavande → prune.
|
||||
static _Encre pour(CardColorHorizontal c) {
|
||||
switch (c) {
|
||||
case CardColorHorizontal.aqua:
|
||||
return const _Encre(
|
||||
Color(0xFF315F63),
|
||||
Color(0xFF4A7276),
|
||||
Color(0xFF2B5868),
|
||||
);
|
||||
case CardColorHorizontal.peach:
|
||||
return const _Encre(
|
||||
Color(0xFF7A4A2E),
|
||||
Color(0xFF8F6248),
|
||||
Color(0xFF6E4530),
|
||||
);
|
||||
case CardColorHorizontal.blue:
|
||||
return const _Encre(
|
||||
Color(0xFF2F4A6E),
|
||||
Color(0xFF486083),
|
||||
Color(0xFF2A4670),
|
||||
);
|
||||
case CardColorHorizontal.pink:
|
||||
return const _Encre(
|
||||
Color(0xFF7A3E52),
|
||||
Color(0xFF8E5668),
|
||||
Color(0xFF6E3A50),
|
||||
);
|
||||
case CardColorHorizontal.lavender:
|
||||
return const _Encre(
|
||||
Color(0xFF5C3D5C),
|
||||
Color(0xFF70536F),
|
||||
Color(0xFF553A60),
|
||||
);
|
||||
case CardColorHorizontal.red:
|
||||
case CardColorHorizontal.lime:
|
||||
case CardColorHorizontal.green:
|
||||
return const _Encre(
|
||||
Color(0xFF2F2F2F),
|
||||
Color(0xFF6B6B6B),
|
||||
Color(0xFF3A3A3A),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _BulleTile extends StatelessWidget {
|
||||
final CarteBulle card;
|
||||
final bool busy;
|
||||
@@ -340,26 +527,51 @@ class _BulleTile extends StatelessWidget {
|
||||
required this.onRefuse,
|
||||
});
|
||||
|
||||
static const _mois = [
|
||||
'janvier',
|
||||
'février',
|
||||
'mars',
|
||||
'avril',
|
||||
'mai',
|
||||
'juin',
|
||||
'juillet',
|
||||
'août',
|
||||
'septembre',
|
||||
'octobre',
|
||||
'novembre',
|
||||
'décembre',
|
||||
];
|
||||
|
||||
String _fmtLong(String? iso) {
|
||||
if (iso == null || iso.isEmpty) return '…';
|
||||
final dt = DateTime.tryParse(iso);
|
||||
if (dt == null) return iso;
|
||||
const mois = [
|
||||
'janvier',
|
||||
'février',
|
||||
'mars',
|
||||
'avril',
|
||||
'mai',
|
||||
'juin',
|
||||
'juillet',
|
||||
'août',
|
||||
'septembre',
|
||||
'octobre',
|
||||
'novembre',
|
||||
'décembre',
|
||||
];
|
||||
final jj = dt.day.toString().padLeft(2, '0');
|
||||
return '$jj ${mois[dt.month - 1]} ${dt.year}';
|
||||
return '$jj ${_mois[dt.month - 1]} ${dt.year}';
|
||||
}
|
||||
|
||||
/// Une ligne type maquette : « Du 04 au 06 novembre 2026 ».
|
||||
String _fmtPeriodeUneLigne() {
|
||||
final d1 = DateTime.tryParse(card.dateDebut ?? '');
|
||||
final d2 = DateTime.tryParse(card.dateFin ?? '');
|
||||
if (d1 == null && d2 == null) return '';
|
||||
if (d1 != null && d2 == null) return 'Le ${_fmtLong(card.dateDebut)}';
|
||||
if (d1 == null && d2 != null) return 'Au ${_fmtLong(card.dateFin)}';
|
||||
final a = d1!;
|
||||
final b = d2!;
|
||||
final j1 = a.day.toString().padLeft(2, '0');
|
||||
final j2 = b.day.toString().padLeft(2, '0');
|
||||
if (a.year == b.year && a.month == b.month && a.day == b.day) {
|
||||
return 'Le $j1 ${_mois[a.month - 1]} ${a.year}';
|
||||
}
|
||||
if (a.year == b.year && a.month == b.month) {
|
||||
return 'Du $j1 au $j2 ${_mois[a.month - 1]} ${a.year}';
|
||||
}
|
||||
if (a.year == b.year) {
|
||||
return 'Du $j1 ${_mois[a.month - 1]} au $j2 ${_mois[b.month - 1]} ${a.year}';
|
||||
}
|
||||
return 'Du $j1 ${_mois[a.month - 1]} ${a.year} '
|
||||
'au $j2 ${_mois[b.month - 1]} ${b.year}';
|
||||
}
|
||||
|
||||
/// Arrêt maladie : reste opaque tant que la période n’est pas finie.
|
||||
@@ -368,8 +580,221 @@ class _BulleTile extends StatelessWidget {
|
||||
return card.statut == CarteStatut.traitee;
|
||||
}
|
||||
|
||||
/// Congés (Validée / Refusée) ou carte ack (Bien reçu).
|
||||
bool get _montreStatutReponse {
|
||||
if (card.peutRepondre) return false;
|
||||
if (card.isCongeAm &&
|
||||
(card.statut == CarteStatut.traitee ||
|
||||
card.statut == CarteStatut.refusee)) {
|
||||
return true;
|
||||
}
|
||||
return card.responseMode == CarteResponseMode.ack &&
|
||||
card.statut == CarteStatut.traitee;
|
||||
}
|
||||
|
||||
String get _libelleStatutReponse {
|
||||
if (card.responseMode == CarteResponseMode.ack) return 'Bien reçu';
|
||||
// Accordé à « Demande de congés ».
|
||||
return card.statut == CarteStatut.refusee ? 'Refusée' : 'Validée';
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final periode = _fmtPeriodeUneLigne();
|
||||
final encre = _Encre.pour(card.colorFamily);
|
||||
|
||||
return Opacity(
|
||||
opacity: _attenuee ? 0.55 : 1,
|
||||
child: Carte(
|
||||
assetPath: card.backgroundAsset,
|
||||
constraints: const BoxConstraints(minHeight: 140),
|
||||
padding: const EdgeInsets.fromLTRB(22, 18, 18, 14),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
card.titreAffiche,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: encre.ink,
|
||||
),
|
||||
),
|
||||
if (periode.isNotEmpty) ...[
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Image.asset(
|
||||
'assets/images/cartes/icon_calendrier_crayon.png',
|
||||
width: 28,
|
||||
height: 28,
|
||||
fit: BoxFit.contain,
|
||||
filterQuality: FilterQuality.high,
|
||||
color: encre.ink,
|
||||
colorBlendMode: BlendMode.srcIn,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
periode,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 15,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: encre.date,
|
||||
height: 1.25,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
if (card.isCongeAm &&
|
||||
card.statut == CarteStatut.refusee &&
|
||||
card.motifRefus != null) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Motif : ${card.motifRefus}',
|
||||
maxLines: 4,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 13,
|
||||
fontStyle: FontStyle.italic,
|
||||
height: 1.3,
|
||||
color: encre.ink,
|
||||
),
|
||||
),
|
||||
] else if (card.statut == CarteStatut.ouverte &&
|
||||
card.isCreator &&
|
||||
(card.isCongeAm ||
|
||||
card.responseMode == CarteResponseMode.ack)) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
card.responseMode == CarteResponseMode.ack
|
||||
? 'En attente d’acquittement'
|
||||
: 'En attente de réponse',
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 12,
|
||||
color: QuotidienTheme.muted,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
if (card.iconAsset != null) ...[
|
||||
const SizedBox(width: 8),
|
||||
Image.asset(
|
||||
card.iconAsset!,
|
||||
width: 72,
|
||||
height: 72,
|
||||
fit: BoxFit.contain,
|
||||
filterQuality: FilterQuality.high,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
if (card.peutRepondre)
|
||||
busy
|
||||
? const SizedBox(
|
||||
width: 28,
|
||||
height: 28,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
)
|
||||
: card.responseMode == CarteResponseMode.ack
|
||||
? _PilulePeinteButton(
|
||||
asset:
|
||||
'assets/images/cartes/btn_coche_pilule.png',
|
||||
tooltip: 'Bien reçu',
|
||||
onTap: onAck,
|
||||
)
|
||||
: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_PilulePeinteButton(
|
||||
asset:
|
||||
'assets/images/cartes/btn_coche_pilule.png',
|
||||
tooltip: 'Accepter',
|
||||
onTap: onAccept,
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
_PilulePeinteButton(
|
||||
asset:
|
||||
'assets/images/cartes/btn_croix_pilule.png',
|
||||
tooltip: 'Refuser',
|
||||
onTap: onRefuse,
|
||||
),
|
||||
],
|
||||
)
|
||||
else if (_montreStatutReponse)
|
||||
Expanded(
|
||||
child: Text(
|
||||
_libelleStatutReponse,
|
||||
textAlign: TextAlign.center,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
fontStyle: FontStyle.italic,
|
||||
color: encre.ink.withValues(alpha: 0.75),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (card.peutRepondre) const SizedBox(width: 8),
|
||||
if (!_montreStatutReponse) const Spacer(),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
content: Text('Agenda — à venir.'),
|
||||
duration: Duration(seconds: 2),
|
||||
),
|
||||
);
|
||||
},
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 4,
|
||||
vertical: 4,
|
||||
),
|
||||
child: Text(
|
||||
'Ouvrir dans l’agenda ↗',
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.right,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: encre.link,
|
||||
decoration: TextDecoration.underline,
|
||||
decorationColor: encre.link,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildGeneric(BuildContext context) {
|
||||
final memeJour = card.dateDebut != null &&
|
||||
card.dateFin != null &&
|
||||
card.dateDebut == card.dateFin;
|
||||
@@ -384,22 +809,66 @@ class _BulleTile extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
card.titreAffiche,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
card.titreAffiche,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
),
|
||||
if (card.dateDebut != null || card.dateFin != null) ...[
|
||||
const SizedBox(height: 10),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 12),
|
||||
child: memeJour
|
||||
? Text(
|
||||
'Le ${_fmtLong(card.dateDebut)}',
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
height: 1.35,
|
||||
),
|
||||
)
|
||||
: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'Du ${_fmtLong(card.dateDebut)}',
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
height: 1.35,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
'Au ${_fmtLong(card.dateFin)}',
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
height: 1.35,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
if (card.iconAsset != null) ...[
|
||||
const SizedBox(width: 8),
|
||||
const SizedBox(width: 10),
|
||||
Image.asset(
|
||||
card.iconAsset!,
|
||||
width: 80,
|
||||
@@ -410,45 +879,6 @@ class _BulleTile extends StatelessWidget {
|
||||
],
|
||||
],
|
||||
),
|
||||
if (card.dateDebut != null || card.dateFin != null) ...[
|
||||
const SizedBox(height: 10),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 12),
|
||||
child: memeJour
|
||||
? Text(
|
||||
'Le ${_fmtLong(card.dateDebut)}',
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
height: 1.35,
|
||||
),
|
||||
)
|
||||
: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'Du ${_fmtLong(card.dateDebut)}',
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
height: 1.35,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
'Au ${_fmtLong(card.dateFin)}',
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
height: 1.35,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
if (card.statut == CarteStatut.refusee) ...[
|
||||
const SizedBox(height: 6),
|
||||
Text(
|
||||
@@ -522,7 +952,111 @@ class _BulleTile extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// Bouton pilule dessiné pleine largeur (fond pastel + coche / croix).
|
||||
/// Modale de refus : le controller vit avec le State (Échap / Annuler OK).
|
||||
class _RefuseDialog extends StatefulWidget {
|
||||
final String title;
|
||||
final String message;
|
||||
|
||||
const _RefuseDialog({
|
||||
required this.title,
|
||||
required this.message,
|
||||
});
|
||||
|
||||
@override
|
||||
State<_RefuseDialog> createState() => _RefuseDialogState();
|
||||
}
|
||||
|
||||
class _RefuseDialogState extends State<_RefuseDialog> {
|
||||
late final TextEditingController _controller;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_controller = TextEditingController();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_controller.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AlertDialog(
|
||||
title: Text(
|
||||
widget.title,
|
||||
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
|
||||
),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text(
|
||||
widget.message,
|
||||
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextField(
|
||||
controller: _controller,
|
||||
maxLines: 3,
|
||||
autofocus: true,
|
||||
decoration: const InputDecoration(
|
||||
hintText: 'Motif du refus…',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () {
|
||||
final text = _controller.text.trim();
|
||||
if (text.isEmpty) return;
|
||||
Navigator.pop(context, text);
|
||||
},
|
||||
child: const Text('Refuser'),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Bouton pilule peinte (coche / croix intégrées) — carte congés.
|
||||
class _PilulePeinteButton extends StatelessWidget {
|
||||
final String asset;
|
||||
final String tooltip;
|
||||
final VoidCallback onTap;
|
||||
|
||||
const _PilulePeinteButton({
|
||||
required this.asset,
|
||||
required this.tooltip,
|
||||
required this.onTap,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Tooltip(
|
||||
message: tooltip,
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
child: Image.asset(
|
||||
asset,
|
||||
height: 36,
|
||||
fit: BoxFit.contain,
|
||||
filterQuality: FilterQuality.high,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Bouton pilule dessiné (fond pastel + coche / croix).
|
||||
class _ActionPill extends StatelessWidget {
|
||||
final String asset;
|
||||
final String iconAsset;
|
||||
|
||||