Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d42927297d | ||
|
|
1d3ec0b759 | ||
|
|
608e62d662 | ||
|
|
dc491470db | ||
|
|
5a73da898b | ||
|
|
0c736f5605 | ||
|
|
6c8ef32a11 | ||
|
|
f3b2da4b4d | ||
|
|
edab253296 | ||
|
|
d61e34a1e6 | ||
|
|
484fb9a3e5 |
@@ -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,
|
||||
|
||||
@@ -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,7 +38,8 @@ 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() };
|
||||
@@ -110,7 +112,6 @@ describe('CardsService (#194)', () => {
|
||||
modifie_le: new Date(),
|
||||
type: {
|
||||
titre: 'Congé AM',
|
||||
couleur: 'lavender',
|
||||
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||
retention_days: 14,
|
||||
},
|
||||
@@ -156,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);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -227,12 +227,14 @@ 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_evenement) {
|
||||
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
||||
@@ -252,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', {
|
||||
@@ -304,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);
|
||||
@@ -395,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 },
|
||||
|
||||
@@ -587,6 +587,12 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
||||
|
||||
**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`
|
||||
|
||||
---
|
||||
|
||||
@@ -41,9 +41,11 @@ Endpoint principal : `GET /api/v1/cards` (filtre couple / placement).
|
||||
| `payload.date_debut` / `date_fin` | Période (agenda) |
|
||||
| `payload.motif` | Texte libre / détail |
|
||||
| `last_refuse_comment` | Si `refusee` |
|
||||
| `id_absence` | Lien métier agenda (si applicable) |
|
||||
| `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.
|
||||
|
||||
@@ -61,7 +63,7 @@ La teinte pastel est **100 % front** : table de mapping `type_code` → asset (`
|
||||
- Libellés UI :
|
||||
- `conge_am` → « Demande de congés »
|
||||
- `arret_maladie_am` → « Arrêt maladie »
|
||||
- `absence_enfant` (+ `_modif`) → « Notification d’absence »
|
||||
- `absence_enfant` → « Notification d’absence »
|
||||
|
||||
### 3.2 Carte **congés** (`conge_am`)
|
||||
|
||||
@@ -93,10 +95,13 @@ Clé = **choix front**, pas une valeur API.
|
||||
|------------|---------|--------|
|
||||
| **`aqua`** | Congés AM | `conge_am` |
|
||||
| **`blue`** | Arrêt maladie AM | `arret_maladie_am` |
|
||||
| **`peach`** | Absence enfant / info pratique | `absence_enfant`, `absence_enfant_modif` |
|
||||
| **`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).
|
||||
@@ -138,6 +143,7 @@ Pourquoi **pas seulement la messagerie** ?
|
||||
| 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` |
|
||||
|
||||
@@ -150,7 +156,9 @@ Variante soins : un seul fond rose ; l’icône / sous-type change.
|
||||
- Créateur : pas de boutons réponse ; éventuel « En attente de réponse ».
|
||||
- Refus : afficher `last_refuse_comment`.
|
||||
- Congé : `accept_refuse` côté destinataire.
|
||||
- Absence enfant : info / ack — pas de veto AM en V1.
|
||||
- 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.
|
||||
|
||||
---
|
||||
@@ -167,11 +175,14 @@ Variante soins : un seul fond rose ; l’icône / sous-type change.
|
||||
## 9. Recettes
|
||||
|
||||
- [ ] API cartes **sans** champ `couleur` (ni feed ni `/types`).
|
||||
- [ ] Front mappe `conge_am` → aqua, `arret_maladie_am` → blue, `absence_*` → peach.
|
||||
- [ ] 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 traité + période en cours → reste visible.
|
||||
- [ ] 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`.
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 591 KiB |
|
Before Width: | Height: | Size: 683 KiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
After Width: | Height: | Size: 289 KiB |
|
After Width: | Height: | Size: 291 KiB |
@@ -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,6 +112,7 @@ 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 {
|
||||
@@ -110,10 +120,11 @@ class CarteBulle {
|
||||
case 'conge_am':
|
||||
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,35 +148,27 @@ class CarteBulle {
|
||||
return !todayDay.isAfter(fin);
|
||||
}
|
||||
|
||||
/// Asset horizontal pastel (palette `assets/cards/` uniquement).
|
||||
String get backgroundAsset {
|
||||
// Congés : aqua (le lavande API ne convient pas au design).
|
||||
if (typeCode == 'conge_am') {
|
||||
return CardColorHorizontal.aqua.path;
|
||||
}
|
||||
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;
|
||||
case 'aqua':
|
||||
return CardColorHorizontal.aqua.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 &&
|
||||
@@ -178,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(),
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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';
|
||||
|
||||
@@ -34,15 +36,20 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
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();
|
||||
@@ -56,6 +63,58 @@ 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;
|
||||
@@ -75,6 +134,33 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
}
|
||||
}
|
||||
|
||||
/// 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;
|
||||
@@ -86,7 +172,7 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_items = items;
|
||||
_items = _trier(items);
|
||||
_loading = false;
|
||||
});
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _syncScrollFades());
|
||||
@@ -113,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) {
|
||||
@@ -138,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: [
|
||||
@@ -159,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;
|
||||
@@ -258,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(
|
||||
@@ -404,14 +459,60 @@ class _CartesFeedState extends State<CartesFeed> {
|
||||
}
|
||||
}
|
||||
|
||||
class _BulleTile extends StatelessWidget {
|
||||
/// Encre aqua foncé — harmonisée fond aqua / valise (pas le violet).
|
||||
static const Color _aquaInk = Color(0xFF315F63);
|
||||
/// Date : même famille, ~12 % plus claire.
|
||||
static const Color _aquaDate = Color(0xFF4A7276);
|
||||
/// Lien agenda : légère dérive bleue.
|
||||
static const Color _aquaLink = Color(0xFF2B5868);
|
||||
/// 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;
|
||||
final VoidCallback onAccept;
|
||||
@@ -479,14 +580,28 @@ class _BulleTile extends StatelessWidget {
|
||||
return card.statut == CarteStatut.traitee;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (card.isCongeAm) return _buildConge(context);
|
||||
return _buildGeneric(context);
|
||||
/// 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;
|
||||
}
|
||||
|
||||
Widget _buildConge(BuildContext context) {
|
||||
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,
|
||||
@@ -511,7 +626,7 @@ class _BulleTile extends StatelessWidget {
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: _aquaInk,
|
||||
color: encre.ink,
|
||||
),
|
||||
),
|
||||
if (periode.isNotEmpty) ...[
|
||||
@@ -525,6 +640,8 @@ class _BulleTile extends StatelessWidget {
|
||||
height: 28,
|
||||
fit: BoxFit.contain,
|
||||
filterQuality: FilterQuality.high,
|
||||
color: encre.ink,
|
||||
colorBlendMode: BlendMode.srcIn,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
@@ -535,7 +652,7 @@ class _BulleTile extends StatelessWidget {
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 15,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: _aquaDate,
|
||||
color: encre.date,
|
||||
height: 1.25,
|
||||
),
|
||||
),
|
||||
@@ -543,26 +660,30 @@ class _BulleTile extends StatelessWidget {
|
||||
],
|
||||
),
|
||||
],
|
||||
if (card.statut == CarteStatut.refusee) ...[
|
||||
if (card.isCongeAm &&
|
||||
card.statut == CarteStatut.refusee &&
|
||||
card.motifRefus != null) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
card.lastRefuseComment != null &&
|
||||
card.lastRefuseComment!.trim().isNotEmpty
|
||||
? 'Refusé — ${card.lastRefuseComment}'
|
||||
: 'Refusé',
|
||||
maxLines: 2,
|
||||
'Motif : ${card.motifRefus}',
|
||||
maxLines: 4,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 12,
|
||||
fontSize: 13,
|
||||
fontStyle: FontStyle.italic,
|
||||
color: _aquaInk,
|
||||
height: 1.3,
|
||||
color: encre.ink,
|
||||
),
|
||||
),
|
||||
] else if (card.statut == CarteStatut.ouverte &&
|
||||
card.isCreator) ...[
|
||||
card.isCreator &&
|
||||
(card.isCongeAm ||
|
||||
card.responseMode == CarteResponseMode.ack)) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'En attente de réponse',
|
||||
card.responseMode == CarteResponseMode.ack
|
||||
? 'En attente d’acquittement'
|
||||
: 'En attente de réponse',
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 12,
|
||||
color: QuotidienTheme.muted,
|
||||
@@ -595,25 +716,46 @@ class _BulleTile extends StatelessWidget {
|
||||
height: 28,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
)
|
||||
: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_PilulePeinteButton(
|
||||
: card.responseMode == CarteResponseMode.ack
|
||||
? _PilulePeinteButton(
|
||||
asset:
|
||||
'assets/images/cartes/btn_coche_pilule.png',
|
||||
tooltip: 'Accepter',
|
||||
onTap: onAccept,
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
_PilulePeinteButton(
|
||||
asset:
|
||||
'assets/images/cartes/btn_croix_pilule.png',
|
||||
tooltip: 'Refuser',
|
||||
onTap: onRefuse,
|
||||
),
|
||||
],
|
||||
),
|
||||
const Spacer(),
|
||||
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(
|
||||
@@ -631,12 +773,15 @@ class _BulleTile extends StatelessWidget {
|
||||
),
|
||||
child: Text(
|
||||
'Ouvrir dans l’agenda ↗',
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.right,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: _aquaLink,
|
||||
color: encre.link,
|
||||
decoration: TextDecoration.underline,
|
||||
decorationColor: _aquaLink,
|
||||
decorationColor: encre.link,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -807,6 +952,80 @@ class _BulleTile extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// 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;
|
||||
|
||||