Compare commits

..
Author SHA1 Message Date
jmartinandCursor 95e787edef feat(#173): carte congés maquette + mini-spec bulles pour alignement back
Layout aqua (valise, période une ligne, pilules peintes, lien agenda),
encre pétrole, et docs/32 pour palette sémantique + demandes API couleur.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-01 16:41:00 +02:00
jmartinandCursor 1047e94363 fix(#173): bulles congé AM en aqua (plus de lavande)
Override front tant que le back renvoie encore couleur=lavender.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-30 17:05:19 +02:00
jmartinandCursor 1678ea6c0b chore: retirer l’import inutilisé de card_assets.dart
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-30 17:04:03 +02:00
jmartinandCursor b35ca8dc8a feat(#173): ajouter la teinte aqua aux cartes (V + H)
Enums, mappings formulaires / bulles / enfants, assets inclus.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-30 17:03:27 +02:00
jmartinandCursor 64c78eef30 fix(#173): icône maladie style précédent, 1 boule, sur square
Conserve le look crayon + croix rose, thermomètre corrigé.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 17:25:24 +02:00
jmartinandCursor 6884eb0752 fix(#173): thermomètre maladie à une seule boule sur square
Icône collée sur square.png comme les congés.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 17:24:48 +02:00
jmartinandCursor 130d6e8d73 fix(#173): icône arrêt maladie (1 boule + square.png)
Thermomètre corrigé (boule uniquement en bas), collé sur square.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 17:24:03 +02:00
jmartinandCursor f1f09617a0 feat(#173): dégradés haut/bas sur la liste de bulles scrollable
Même logique que le slider enfants : fondu aux bords sauf au
premier et au dernier élément.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 17:21:13 +02:00
jmartinandCursor bd85f7792b fix(#173): icône en colonne à droite, texte (titre+dates) regroupé
Les 3 lignes restent ensemble à gauche face à l’icône.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 17:14:56 +02:00
jmartinandCursor fadfde1017 fix(#173): restaurer icon_carte_conges2 avec fond carré opaque
Sans détourage — le fond crème fait partie du dessin.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 17:10:01 +02:00
jmartinandCursor e05d071834 fix(#173): icône congés v2 (icon_carte_conges2)
Branche Demande de congés sur la version 2 détourée.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 17:03:44 +02:00
jmartinandCursor 69b7d1a537 fix(#173): détourage propre des icônes cartes + taille 80px
Fond blanc découpé (flood-fill), crop serré, affichage plus grand.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 16:55:44 +02:00
jmartinandCursor e1d29b59db fix(#173): déclarer assets/images/cartes dans pubspec
Les nouvelles icônes n’étaient pas dans le build (hot restart
insuffisant pour les assets ajoutés).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 16:46:15 +02:00
jmartinandCursor bf1849a6c1 feat(#173): icône dessin en haut à droite selon le type de bulle
Congés / arrêt maladie / absence — assets remplaçables dans
assets/images/cartes/.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 16:41:58 +02:00
jmartinandCursor 805145ea17 fix(#173): dates en Merienda, plus grandes, indentées ; sans motif
Retire l’affichage du commentaire / motif sur la bulle.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 16:30:40 +02:00
jmartinandCursor 22bdabf890 fix(#173): layout bulle selon maquette (Du/Au + pilules larges)
Titre, dates en français sur deux lignes, actions coche/croix
en pilules pleine largeur côte à côte.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 16:26:04 +02:00
jmartinandCursor 6237ddeb29 fix(#173): actions en pilules + modales, fin des libellés À traiter
Arrêt maladie reste visible jusqu’à la date de fin ; accepter /
refuser / ack passent par une confirmation modale.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 16:12:47 +02:00
jmartinandCursor 8d1612326a fix(#173): libellés sémantiques des bulles (congés, arrêt, absence)
Demande de congés / Arrêt maladie / Notification d’absence.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 16:06:13 +02:00
jmartinandCursor 734de354c7 docs(#173): schéma d’extension des cartes (extensible.png)
Référence visuelle des zones fixes / extensibles pour Carte.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 12:23:40 +02:00
jmartinandCursor b38cb8ec1b refactor(#173): widget Carte (extensible par défaut) + fix bandeau
Renomme NineSlice* en Carte. Le bandeau couple s’étire en
horizontal seulement pour garder les bouts demi-cercle.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 12:22:24 +02:00
jmartinandCursor ef5c7a3ab5 refactor(#173): widget NineSliceAsset réutilisable (cartes + bandeau)
Presets cards/bandeau, cache images, appliqué au sélecteur couple.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 12:19:16 +02:00
jmartinandCursor 47094a3428 fix(#173): 9-slice manuel avec coins à taille logique fixe
Remplace DecorationImage.centerSlice (inopérant si bulle trop
basse) par un peintre 9 zones : coins fixes, centre extensible.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 12:16:24 +02:00
jmartinandCursor 6177f64b23 fix(#173): ExactAssetImage pour le scale 9-slice
AssetImage n’accepte pas scale ; ExactAssetImage oui.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 12:13:53 +02:00
jmartinandCursor dcede62ca5 fix(#173): 9-slice dynamique sur les bulles (centerSlice)
Coins fixes, bords et centre extensibles selon la taille réelle
de la bulle — sans assets .9.png Android.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 12:13:20 +02:00
jmartinandCursor c42b2df84b feat(#173): feed bulles parent branché sur GET /cards
Affiche la file d’attention pastel (assets card_*_h) filtrée
par couple courant, avec accept / refus motivé / ack.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 11:53:40 +02:00
jmartinandCursor 0842f66df8 fix: typage comment insert card_responses
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 10:54:02 +02:00
jmartin c3fd098464 Merge branch 'feature/fix-card-respond-id-card' into develop 2026-09-25 10:52:37 +02:00
jmartinandCursor ed3546d196 fix(#194): insert card_responses avec id_card explicite
TypeORM nullifiait id_card (conflit Column/JoinColumn) → 500 sur respond.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-25 10:52:36 +02:00
jmartin da6836cda3 Merge branch 'feature/170-fix-api-couples-am' into develop
fix(#170): API couples-garde AM + bandeau parents unifié.
2026-09-25 10:42:24 +02:00
jmartinandCursor 91f2c3e1ef fix(#170): brancher l’API couples-garde AM et unifier le bandeau
Évite le 403 en appelant /assistantes-maternelles/me/couples-garde,
parse parents[], et affiche « Prénom1 et Prénom2 » sans vignette.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 16:04:34 +02:00
jmartin 4007d7010e Merge branch 'develop' of https://git.ptits-pas.fr/jmartin/petitspas into develop 2026-09-24 12:19:40 +02:00
jmartinandCursor 4261667198 feat(#170): sélecteur couple enfant-parent(s) pour AM
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 12:19:26 +02:00
jmartin 15e2d8d850 Merge branch 'feature/171-api-couples-garde-am' into develop
API couples-garde AM (#171).
2026-09-24 12:17:09 +02:00
jmartinandCursor 34a516d509 feat(#169): coquille TdB AM 3 colonnes
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 12:16:44 +02:00
jmartinandCursor da71803852 feat(#171): API couples-garde AM (liste + courant)
Symétrique #168 : GET/PUT /assistantes-maternelles/me/couples-garde
avec parents[] pour le bandeau enfant|foyer. Colonne
id_placement_garde_courant sur assistantes_maternelles.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 12:14:16 +02:00
jmartin 2380aa9826 Merge branch 'develop' of https://git.ptits-pas.fr/jmartin/petitspas into develop 2026-09-24 11:58:52 +02:00
jmartin c952113099 Merge branch 'feature/187-agenda-absences-stub' into develop 2026-09-24 11:58:38 +02:00
jmartinandCursor 8204669ec9 fix(ui): use TokenService to fix 401 Unauthorized when calling absences API
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 11:57:03 +02:00
jmartin 76ab0f340a Merge branch 'feature/195-realtime-cartes' into develop
Realtime SSE Cartes (#195).
2026-09-24 11:55:17 +02:00
jmartinandCursor a0a5e15b04 feat(front): add app icon for android, web and windows + agenda stub
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 11:53:43 +02:00
64 changed files with 2834 additions and 191 deletions
@@ -1,4 +1,4 @@
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn } from 'typeorm';
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn, ManyToOne } from 'typeorm';
import { Users } from './users.entity';
import { AmChildren } from './am_children.entity';
@@ -37,22 +37,32 @@ export class AssistanteMaternelle {
@Column({ name: 'ville_residence', length: 100, nullable: true })
residence_city?: string;
@Column( { name: 'date_agrement', type: 'date', nullable: true })
@Column({ name: 'date_agrement', type: 'date', nullable: true })
agreement_date?: Date;
@Column( { name: 'annee_experience', type: 'smallint', nullable: true })
@Column({ name: 'annee_experience', type: 'smallint', nullable: true })
years_experience?: number;
@Column( { name: 'specialite', length: 100, nullable: true })
@Column({ name: 'specialite', length: 100, nullable: true })
specialty?: string;
@Column( { name: 'place_disponible', type: 'integer', nullable: true })
@Column({ name: 'place_disponible', type: 'integer', nullable: true })
places_available?: number;
/** Numéro de dossier (format AAAA-NNNNNN), même valeur que sur utilisateurs (ticket #103) */
@Column({ name: 'numero_dossier', length: 20, nullable: true })
numero_dossier?: string;
/**
* Placement AM↔enfant sélectionné sur le TdB AM (couple actif) — ticket #171.
*/
@Column({ name: 'id_placement_garde_courant', type: 'uuid', nullable: true })
id_placement_garde_courant?: string;
@ManyToOne(() => AmChildren, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'id_placement_garde_courant', referencedColumnName: 'id' })
placement_garde_courant?: AmChildren;
@OneToMany(() => AmChildren, (ac) => ac.am)
amChildren: AmChildren[];
}
+6 -8
View File
@@ -204,14 +204,12 @@ export class CardsService {
throw new BadRequestException('Motivation obligatoire en cas de refus');
}
await this.responsesRepo.save(
this.responsesRepo.create({
id_card: card.id,
id_utilisateur: userId,
action: dto.action,
comment: dto.comment?.trim(),
}),
);
await this.responsesRepo.insert({
id_card: card.id,
id_utilisateur: userId,
action: dto.action,
comment: dto.comment?.trim() || undefined,
});
if (card.id_absence) {
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
@@ -10,7 +10,10 @@ describe('AssistantesMaternellesController', () => {
const authServiceMock = {
createAmDossierStaff: jest.fn(),
};
const amServiceMock = {};
const amServiceMock = {
listerCouplesGarde: jest.fn(),
definirCoupleGardeCourant: jest.fn(),
};
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
@@ -66,4 +69,29 @@ describe('AssistantesMaternellesController', () => {
);
expect(res.numero_dossier).toBe('2026-000001');
});
it('listerCouplesGarde délègue au service (#171)', async () => {
amServiceMock.listerCouplesGarde.mockResolvedValue({
couples: [],
couple_courant_id: null,
});
const res = await controller.listerCouplesGarde('am-uuid');
expect(amServiceMock.listerCouplesGarde).toHaveBeenCalledWith('am-uuid');
expect(res.couple_courant_id).toBeNull();
});
it('definirCoupleGardeCourant délègue au service (#171)', async () => {
amServiceMock.definirCoupleGardeCourant.mockResolvedValue({
couples: [{ id: 'pl-1', courant: true }],
couple_courant_id: 'pl-1',
});
const res = await controller.definirCoupleGardeCourant('am-uuid', {
couple_id: 'pl-1',
});
expect(amServiceMock.definirCoupleGardeCourant).toHaveBeenCalledWith(
'am-uuid',
'pl-1',
);
expect(res.couple_courant_id).toBe('pl-1');
});
});
@@ -2,6 +2,7 @@ import {
Controller,
Get,
Post,
Put,
Body,
Patch,
Param,
@@ -20,6 +21,8 @@ import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
import { StaffCreateAmDossierResponseDto } from './dto/staff-create-am-dossier-response.dto';
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
import { DefinirCoupleGardeCourantAmDto } from './dto/definir-couple-garde-courant-am.dto';
import { RolesGuard } from 'src/common/guards/roles.guard';
import { AuthGuard } from 'src/common/guards/auth.guard';
import { User } from 'src/common/decorators/user.decorator';
@@ -83,6 +86,36 @@ export class AssistantesMaternellesController {
return mapAmsForApi(ams);
}
@Get('me/couples-garde')
@Roles(RoleType.ASSISTANTE_MATERNELLE)
@ApiOperation({
summary: 'Couples de garde de l’AM connectée — ticket #171',
description:
'Placements actifs (enfant + parents) pour peupler le bandeau couple TdB AM, ' +
'avec indication du couple courant.',
})
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
listerCouplesGarde(
@User('id') userId: string,
): Promise<CouplesGardeAmResponseDto> {
return this.assistantesMaternellesService.listerCouplesGarde(userId);
}
@Put('me/couples-garde/courant')
@Roles(RoleType.ASSISTANTE_MATERNELLE)
@ApiOperation({ summary: 'Définir le couple de garde courant (AM) — ticket #171' })
@ApiBody({ type: DefinirCoupleGardeCourantAmDto })
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
definirCoupleGardeCourant(
@User('id') userId: string,
@Body() dto: DefinirCoupleGardeCourantAmDto,
): Promise<CouplesGardeAmResponseDto> {
return this.assistantesMaternellesService.definirCoupleGardeCourant(
userId,
dto.couple_id,
);
}
@Roles(RoleType.SUPER_ADMIN, RoleType.GESTIONNAIRE, RoleType.ADMINISTRATEUR)
@Get(':id')
@ApiParam({ name: 'id', description: "UUID de la nounou" })
@@ -4,13 +4,21 @@ import { AssistantesMaternellesController } from './assistantes_maternelles.cont
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
import { AmChildren } from 'src/entities/am_children.entity';
import { Children } from 'src/entities/children.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
import { TypeOrmModule } from '@nestjs/typeorm';
import { Users } from 'src/entities/users.entity';
import { AuthModule } from '../auth/auth.module';
@Module({
imports: [TypeOrmModule.forFeature([AssistanteMaternelle, AmChildren, Children, Users]),
AuthModule
imports: [
TypeOrmModule.forFeature([
AssistanteMaternelle,
AmChildren,
Children,
Users,
ParentsChildren,
]),
AuthModule,
],
controllers: [AssistantesMaternellesController],
providers: [AssistantesMaternellesService],
@@ -19,4 +27,4 @@ import { AuthModule } from '../auth/auth.module';
TypeOrmModule,
],
})
export class AssistantesMaternellesModule { }
export class AssistantesMaternellesModule {}
@@ -1,18 +1,150 @@
import { NotFoundException } from '@nestjs/common';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { AssistantesMaternellesService } from './assistantes_maternelles.service';
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
import { Users } from 'src/entities/users.entity';
import { AmChildren } from 'src/entities/am_children.entity';
import { Children } from 'src/entities/children.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
describe('AssistantesMaternellesService', () => {
describe('AssistantesMaternellesService — couples de garde (#171)', () => {
let service: AssistantesMaternellesService;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [AssistantesMaternellesService],
}).compile();
const amRepo = { findOne: jest.fn(), update: jest.fn() };
const usersRepo = {};
const amChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
const childrenRepo = {};
const parentsChildrenRepo = { find: jest.fn() };
service = module.get<AssistantesMaternellesService>(AssistantesMaternellesService);
beforeEach(async () => {
jest.clearAllMocks();
const module: TestingModule = await Test.createTestingModule({
providers: [
AssistantesMaternellesService,
{ provide: getRepositoryToken(AssistanteMaternelle), useValue: amRepo },
{ provide: getRepositoryToken(Users), useValue: usersRepo },
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
{ provide: getRepositoryToken(Children), useValue: childrenRepo },
{
provide: getRepositoryToken(ParentsChildren),
useValue: parentsChildrenRepo,
},
],
}).compile();
service = module.get(AssistantesMaternellesService);
});
it('should be defined', () => {
expect(service).toBeDefined();
});
describe('listerCouplesGarde', () => {
it('retourne vide si aucun placement', async () => {
amRepo.findOne.mockResolvedValue({
user_id: 'am-1',
id_placement_garde_courant: null,
});
amChildrenRepo.find.mockResolvedValue([]);
const res = await service.listerCouplesGarde('am-1');
expect(res).toEqual({ couples: [], couple_courant_id: null });
expect(parentsChildrenRepo.find).not.toHaveBeenCalled();
});
it('mappe placements + parents et marque le courant', async () => {
amRepo.findOne.mockResolvedValue({
user_id: 'am-1',
id_placement_garde_courant: 'pl-2',
});
amChildrenRepo.find.mockResolvedValue([
{
id: 'pl-1',
enfantId: 'e1',
child: { id: 'e1', first_name: 'Léa', last_name: 'M', photo_url: null },
},
{
id: 'pl-2',
enfantId: 'e2',
child: { id: 'e2', first_name: 'Emma', last_name: 'M', photo_url: null },
},
]);
parentsChildrenRepo.find.mockResolvedValue([
{
parentId: 'p1',
enfantId: 'e1',
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
},
{
parentId: 'p2',
enfantId: 'e1',
parent: { user: { prenom: 'Thomas', nom: 'Martin', photo_url: null } },
},
{
parentId: 'p1',
enfantId: 'e2',
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
},
]);
const res = await service.listerCouplesGarde('am-1');
expect(res.couples).toHaveLength(2);
expect(res.couple_courant_id).toBe('pl-2');
expect(res.couples[1].courant).toBe(true);
expect(res.couples[0].parents).toHaveLength(2);
expect(res.couples[0].parents[0].prenom).toBe('Claire');
expect(res.couples[0].enfant.prenom).toBe('Léa');
});
it('404 si AM inconnue', async () => {
amRepo.findOne.mockResolvedValue(null);
await expect(service.listerCouplesGarde('x')).rejects.toBeInstanceOf(
NotFoundException,
);
});
});
describe('definirCoupleGardeCourant', () => {
it('persiste si le placement appartient à l’AM', async () => {
amRepo.findOne.mockResolvedValue({
user_id: 'am-1',
id_placement_garde_courant: null,
});
amChildrenRepo.findOne.mockResolvedValue({
id: 'pl-1',
amId: 'am-1',
enfantId: 'e1',
});
amRepo.update.mockResolvedValue({ affected: 1 });
amChildrenRepo.find.mockResolvedValue([
{
id: 'pl-1',
enfantId: 'e1',
child: { id: 'e1', first_name: 'Léa', last_name: null, photo_url: null },
},
]);
parentsChildrenRepo.find.mockResolvedValue([
{
parentId: 'p1',
enfantId: 'e1',
parent: { user: { prenom: 'Claire', nom: 'M', photo_url: null } },
},
]);
const res = await service.definirCoupleGardeCourant('am-1', 'pl-1');
expect(amRepo.update).toHaveBeenCalledWith(
{ user_id: 'am-1' },
{ id_placement_garde_courant: 'pl-1' },
);
expect(res.couple_courant_id).toBe('pl-1');
expect(res.couples[0].courant).toBe(true);
});
it('404 si placement d’une autre AM', async () => {
amRepo.findOne.mockResolvedValue({ user_id: 'am-1' });
amChildrenRepo.findOne.mockResolvedValue(null);
await expect(
service.definirCoupleGardeCourant('am-1', 'pl-x'),
).rejects.toBeInstanceOf(NotFoundException);
});
});
});
@@ -5,14 +5,16 @@ import {
NotFoundException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { IsNull, Repository } from 'typeorm';
import { In, IsNull, Repository } from 'typeorm';
import { RoleType, Users } from 'src/entities/users.entity';
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
import { AmChildren } from 'src/entities/am_children.entity';
import { Children, StatutEnfantType } from 'src/entities/children.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
import { CreateAssistanteDto } from '../user/dto/create_assistante.dto';
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
import { validateNir } from 'src/common/utils/nir.util';
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
@@ -28,6 +30,8 @@ export class AssistantesMaternellesService {
private readonly amChildrenRepository: Repository<AmChildren>,
@InjectRepository(Children)
private readonly childrenRepository: Repository<Children>,
@InjectRepository(ParentsChildren)
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
) {}
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
@@ -264,4 +268,107 @@ export class AssistantesMaternellesService {
await this.assistantesMaternelleRepository.delete(id);
return { message: 'Assistante maternelle supprimée' };
}
/**
* Liste les couples de garde (enfant ↔ parents) de l’AM connectée — ticket #171.
* Un couple = un placement actif dans enfants_assistantes_maternelles pour cette AM.
*/
async listerCouplesGarde(amUserId: string): Promise<CouplesGardeAmResponseDto> {
const am = await this.assistantesMaternelleRepository.findOne({
where: { user_id: amUserId },
});
if (!am) {
throw new NotFoundException('Assistante maternelle introuvable');
}
const placements = await this.amChildrenRepository.find({
where: { amId: amUserId, date_fin: IsNull() },
relations: ['child'],
order: { date_debut: 'ASC' },
});
if (placements.length === 0) {
return { couples: [], couple_courant_id: null };
}
const enfantIds = placements.map((p) => p.enfantId);
const liens = await this.parentsChildrenRepository.find({
where: { enfantId: In(enfantIds) },
relations: ['parent', 'parent.user'],
});
const parentsByEnfant = new Map<
string,
{ id: string; prenom: string | null; nom: string | null; photo_url: string | null }[]
>();
for (const l of liens) {
const list = parentsByEnfant.get(l.enfantId) ?? [];
const u = l.parent?.user;
list.push({
id: l.parentId,
prenom: u?.prenom ?? null,
nom: u?.nom ?? null,
photo_url: u?.photo_url ?? null,
});
parentsByEnfant.set(l.enfantId, list);
}
let idCourant = am.id_placement_garde_courant ?? null;
const idsValides = new Set(placements.map((p) => p.id));
if (idCourant && !idsValides.has(idCourant)) {
idCourant = null;
await this.assistantesMaternelleRepository.update(
{ user_id: amUserId },
{ id_placement_garde_courant: () => 'NULL' },
);
}
if (!idCourant && placements.length === 1) {
idCourant = placements[0].id;
}
const couples = placements.map((p) => ({
id: p.id,
enfant: {
id: p.child.id,
prenom: p.child.first_name ?? null,
nom: p.child.last_name ?? null,
photo_url: p.child.photo_url ?? null,
},
parents: parentsByEnfant.get(p.enfantId) ?? [],
courant: idCourant != null && p.id === idCourant,
}));
return {
couples,
couple_courant_id: idCourant,
};
}
/**
* Persiste le couple de garde actif pour l’AM — ticket #171.
*/
async definirCoupleGardeCourant(
amUserId: string,
coupleId: string,
): Promise<CouplesGardeAmResponseDto> {
const am = await this.assistantesMaternelleRepository.findOne({
where: { user_id: amUserId },
});
if (!am) {
throw new NotFoundException('Assistante maternelle introuvable');
}
const placement = await this.amChildrenRepository.findOne({
where: { id: coupleId, amId: amUserId, date_fin: IsNull() },
});
if (!placement) {
throw new NotFoundException('Couple de garde introuvable ou inactif pour cette AM');
}
await this.assistantesMaternelleRepository.update(
{ user_id: amUserId },
{ id_placement_garde_courant: coupleId },
);
return this.listerCouplesGarde(amUserId);
}
}
@@ -0,0 +1,67 @@
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
/** Identité minimale enfant — ticket #171 (miroir #168) */
export class CoupleGardeAmEnfantDto {
@ApiProperty({ format: 'uuid' })
id: string;
@ApiPropertyOptional()
prenom?: string | null;
@ApiPropertyOptional()
nom?: string | null;
@ApiPropertyOptional()
photo_url?: string | null;
}
/** Identité minimale parent pour bandeau AM — ticket #171 */
export class CoupleGardeAmParentDto {
@ApiProperty({ format: 'uuid', description: 'UUID utilisateur du parent' })
id: string;
@ApiPropertyOptional()
prenom?: string | null;
@ApiPropertyOptional()
nom?: string | null;
@ApiPropertyOptional()
photo_url?: string | null;
}
/**
* Un couple côté AM = placement actif enfant ↔ foyer parents.
* `id` = enfants_assistantes_maternelles.id (même clé que #168).
*/
export class CoupleGardeAmDto {
@ApiProperty({
format: 'uuid',
description: 'Id du placement (enfants_assistantes_maternelles.id)',
})
id: string;
@ApiProperty({ type: CoupleGardeAmEnfantDto })
enfant: CoupleGardeAmEnfantDto;
@ApiProperty({
type: [CoupleGardeAmParentDto],
description: 'Parents rattachés à l’enfant (0–2 typiquement)',
})
parents: CoupleGardeAmParentDto[];
@ApiProperty({ description: 'True si c’est le couple actuellement sélectionné' })
courant: boolean;
}
export class CouplesGardeAmResponseDto {
@ApiProperty({ type: [CoupleGardeAmDto] })
couples: CoupleGardeAmDto[];
@ApiPropertyOptional({
format: 'uuid',
nullable: true,
description: 'Id du couple courant (null si aucun)',
})
couple_courant_id: string | null;
}
@@ -0,0 +1,13 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsUUID } from 'class-validator';
/** Corps PUT couple de garde courant AM — ticket #171 */
export class DefinirCoupleGardeCourantAmDto {
@ApiProperty({
format: 'uuid',
description: 'Id du placement (enfants_assistantes_maternelles.id) à sélectionner',
})
@IsUUID()
@IsNotEmpty()
couple_id: string;
}
+14 -1
View File
@@ -143,7 +143,10 @@ CREATE TABLE assistantes_maternelles (
annee_experience SMALLINT,
specialite VARCHAR(100),
place_disponible INT,
numero_dossier VARCHAR(20)
numero_dossier VARCHAR(20),
-- Préférence couple de garde actif (TdB quotidien AM) — ticket #171
-- FK ajoutée après création de enfants_assistantes_maternelles (voir ALTER plus bas)
id_placement_garde_courant UUID
);
CREATE INDEX idx_assistantes_maternelles_numero_dossier
@@ -221,6 +224,16 @@ CREATE INDEX idx_parents_placement_garde_courant
ON parents(id_placement_garde_courant)
WHERE id_placement_garde_courant IS NOT NULL;
-- FK couple courant AM → placement (#171)
ALTER TABLE assistantes_maternelles
ADD CONSTRAINT fk_am_placement_garde_courant
FOREIGN KEY (id_placement_garde_courant)
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
CREATE INDEX idx_am_placement_garde_courant
ON assistantes_maternelles(id_placement_garde_courant)
WHERE id_placement_garde_courant IS NOT NULL;
-- ==========================================================
-- Table : dossier_famille (inscription parent — ticket #119)
-- ==========================================================
@@ -0,0 +1,10 @@
-- Ticket #171 — Couple de garde courant (préférence AM)
-- Idempotent : safe à rejouer.
ALTER TABLE assistantes_maternelles
ADD COLUMN IF NOT EXISTS id_placement_garde_courant UUID
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
CREATE INDEX IF NOT EXISTS idx_am_placement_garde_courant
ON assistantes_maternelles(id_placement_garde_courant)
WHERE id_placement_garde_courant IS NOT NULL;
+1 -1
View File
@@ -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é
+159
View File
@@ -0,0 +1,159 @@
# Mini-spec · Bulles / file d’attention (#173)
*Front · octobre 2026 — pour alignement backend (garant de la spec 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, absences, plus tard soins / admin).
Cette note formalise :
1. **Ce qui est déjà en place côté front** (branche `feature/173-feed-bulles-parent`).
2. La **palette sémantique** retenue (couleur = famille).
3. Les **évolutions API** souhaitées pour que le back pousse les bonnes `couleur` / types.
4. Les **idées de bulles futures** (non branchées).
Les cartes restent une **mémoire courte** (`purge_at`) ; la source de vérité absences / congés reste `absences_garde` (voir `31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md`).
---
## 2. Contrat API actuel (rappel)
Endpoint principal : `GET /api/v1/cards` (filtre couple / placement).
Champs utiles côté UI :
| Champ | Rôle UI |
|-------|---------|
| `type_code` | Layout + libellé sémantique + icône |
| `couleur` | Teinte du fond pastel (`assets/cards/card_*_h.png`) |
| `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 affichée |
| `payload.motif` | Non affiché sur la maquette congés actuelle |
| `last_refuse_comment` | Affiché si `refusee` |
| `id_absence` | Lien métier absence / congé |
| `purge_at` | Péremption file |
**Règle front actuelle :** 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 carte via widget `Carte` (bandeau / 9-slice horizontal).
- Dégradés haut / bas sur la liste scrollable.
- Plus de libellés « À traiter / Traité » : actions via **modales** accepter / refuser / ack.
- Libellés UI sémantiques (indépendants du `titre` API brut) :
- `conge_am` → « Demande de congés »
- `arret_maladie_am` → « Arrêt maladie »
- `absence_enfant` (+ `_modif`) → « Notification d’absence »
### 3.2 Carte **congés** (`conge_am`) — maquette validée
| Élément | Comportement |
|---------|----------------|
| Fond | **Aqua** forcé côté front (même si l’API envoie encore `lavender`) |
| Encre | Pétrole désaturé `#315F63` (titre) ; date un peu plus claire `#4A7276` ; lien `#2B5868` |
| Icône | Valise `assets/images/valise.png` |
| Période | Une ligne type « Du 04 au 06 novembre 2026 » + petite icône calendrier |
| Actions | Pilules peintes ✓ vert / ✕ corail (`btn_coche_pilule` / `btn_croix_pilule`) si `accept_refuse` |
| Lien | « Ouvrir dans l’agenda ↗ » (stub UI pour l’instant) |
| Opacité | Carte atténuée si `traitee` (sauf règle arrêt maladie ci-dessous) |
### 3.3 Arrêt maladie (`arret_maladie_am`)
- Reste **visible / opaque** tant que la période n’est pas finie (`date_fin` jour inclus), même si `statut == traitee`.
- Icône thermomètre (asset dédié). Fond encore piloté par `couleur` API (cible produit : **bleu** — voir §4).
### 3.4 Assets couleurs horizontales
Teintes dispo dans `frontend/assets/cards/` (V + H), dont **`aqua`** ajouté pour les congés.
Clés API reconnues côté front : `red` · `pink` · `peach` · `lime` · `lavender` · `green` · `blue` · **`aqua`**. Défaut UI si inconnu : `peach`.
---
## 4. Palette sémantique (alignement demandé)
| Couleur API (`couleur`) | Famille | Types / exemples |
|-------------------------|---------|------------------|
| **`aqua`** | Congés | `conge_am` |
| **`blue`** | Arrêt maladie | `arret_maladie_am` |
| **`pink`** | Soins du quotidien | médicament, température, bobo, crème… (futur) |
| **`peach`** | Absence / info pratique | `absence_enfant`, `absence_enfant_modif` |
| **`lavender`** | Administratif / autre | infos admin, divers (à utiliser avec parcimonie) |
**Principes**
- La **couleur** = famille (lisible sans lire tout le texte).
- L’**icône** précise l’action (surtout sur fond rose : thermomètre, flacon, pansement, croix de soin…).
- Rose = doux / rassurant, **pas** une alerte médicale forte.
- Éviter le lavande pour les congés (trop « admin », dissonant avec valise / aqua).
### Demande backend (prioritaire)
1. Seeds / création de cartes : `conge_am` → `couleur: "aqua"` (le front force déjà ; l’API devrait être source de vérité).
2. `arret_maladie_am` → `couleur: "blue"`.
3. `absence_enfant*` → `couleur: "peach"`.
4. Documenter les valeurs autorisées de `couleur` (enum / check) pour inclure `aqua`.
5. Ne plus mapper les congés sur `lavender`.
---
## 5. Idées de bulles futures (hors scope #173)
Non implémentées ; pour anticipation contrat types + couleurs.
| Famille | Couleur | Exemples de `type_code` (propositions) | `response_mode` typique | Icônes (ex.) |
|---------|---------|----------------------------------------|-------------------------|--------------|
| Soins | `pink` | `soin_temperature`, `soin_medicament`, `soin_bobo`, `soin_creme` | `ack` (parent) | thermomètre, flacon, pansement, tube |
| Sortie / autorisation | `peach` ou `lavender` | `sortie_a_valider` | `accept_refuse` | à définir |
| Admin | `lavender` | `info_admin`, `document_a_fournir` | `ack` / `none` | classeur, tampon |
| Congé / maladie (évol.) | `aqua` / `blue` | modif période, annulation | selon métier | valise / thermomètre |
**Variante soins :** un seul fond rose ; l’icône change selon l’événement — la famille « santé/soin » reste immédiate.
---
## 6. Comportements métier à ne pas casser
- Créateur : pas de boutons réponse ; éventuel libellé « En attente de réponse ».
- Refus : afficher `last_refuse_comment` si présent.
- Congé : `accept_refuse` côté destinataire.
- Absence enfant : souvent info / ack (pas de veto AM en V1 — voir mini-spec quotidien).
- Péremption : respecter `purge_at` / retention ; pas un historique long.
---
## 7. 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` — layout feed + carte congés
- `frontend/lib/models/card_assets.dart` — enum teintes dont `aqua`
- Assets : `frontend/assets/cards/card_aqua(_h).png`, `frontend/assets/images/valise.png`, `frontend/assets/images/cartes/btn_*_pilule.png`
---
## 8. Non-régression / recettes suggérées (back + front)
- [ ] Carte `conge_am` créée avec `couleur=aqua` (et lisible si encore lavande côté vieux seeds grâce au forçage front).
- [ ] Accept / refuse congé → statut + commentaire refus.
- [ ] Arrêt maladie traité mais période en cours → reste visible côté destinataire.
- [ ] Filtre couple / placement : une seule file pour le couple actif.
- [ ] Aucune régression sur `absence_enfant` (création parent → bulle AM).
---
## 9. Références
- Ticket front : **#173**
- Contrat cartes / réponses : **#194** (si applicable)
- Quotidien parent–AM : `docs/31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md`
- Maquette congés : `ressources/bulle_congés.jpg`
@@ -2,7 +2,7 @@
<application
android:label="p_tits_pas"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
android:icon="@mipmap/launcher_icon">
<activity
android:name=".MainActivity"
android:exported="true"
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 741 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 692 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 591 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 683 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 KiB

+58
View File
@@ -0,0 +1,58 @@
class AbsenceGarde {
final String id;
final String idPlacement;
final String type;
final String dateDebut;
final String dateFin;
final String statut;
final String expireAt;
final String? creePar;
final String? motif;
final String? idEnfant;
final String? prenomEnfant;
final String? idAm;
final String? prenomAm;
final String? nomAm;
final String creeLe;
final String modifieLe;
AbsenceGarde({
required this.id,
required this.idPlacement,
required this.type,
required this.dateDebut,
required this.dateFin,
required this.statut,
required this.expireAt,
this.creePar,
this.motif,
this.idEnfant,
this.prenomEnfant,
this.idAm,
this.prenomAm,
this.nomAm,
required this.creeLe,
required this.modifieLe,
});
factory AbsenceGarde.fromJson(Map<String, dynamic> json) {
return AbsenceGarde(
id: json['id'] ?? '',
idPlacement: json['id_placement'] ?? '',
type: json['type'] ?? '',
dateDebut: json['date_debut'] ?? '',
dateFin: json['date_fin'] ?? '',
statut: json['statut'] ?? '',
expireAt: json['expire_at'] ?? '',
creePar: json['cree_par'],
motif: json['motif'],
idEnfant: json['id_enfant'],
prenomEnfant: json['prenom_enfant'],
idAm: json['id_am'],
prenomAm: json['prenom_am'],
nomAm: json['nom_am'],
creeLe: json['cree_le'] ?? '',
modifieLe: json['modifie_le'] ?? '',
);
}
}
+5 -3
View File
@@ -5,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);
@@ -18,8 +19,9 @@ 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);
}
}
+203
View File
@@ -0,0 +1,203 @@
import 'package:p_tits_pas/models/card_assets.dart';
/// Statut d'une instance de carte (file d'attention) — contrat #194 / #173.
enum CarteStatut {
ouverte('ouverte'),
refusee('refusee'),
traitee('traitee');
final String apiValue;
const CarteStatut(this.apiValue);
static CarteStatut fromApi(String? raw) {
switch (raw) {
case 'refusee':
return CarteStatut.refusee;
case 'traitee':
return CarteStatut.traitee;
case 'ouverte':
default:
return CarteStatut.ouverte;
}
}
}
/// Mode de réponse attendu selon le type SYSTEM.
enum CarteResponseMode {
none('none'),
ack('ack'),
acceptRefuse('accept_refuse');
final String apiValue;
const CarteResponseMode(this.apiValue);
static CarteResponseMode fromApi(String? raw) {
switch (raw) {
case 'ack':
return CarteResponseMode.ack;
case 'accept_refuse':
return CarteResponseMode.acceptRefuse;
case 'none':
default:
return CarteResponseMode.none;
}
}
}
/// Bulle / carte de la file d'attention.
class CarteBulle {
final String id;
final String typeCode;
final String titre;
final String? couleur;
final String idPlacement;
final String? idAbsence;
final String operation;
final CarteStatut statut;
final Map<String, dynamic> payload;
final DateTime? purgeAt;
final String? creePar;
final bool isCreator;
final CarteResponseMode responseMode;
final String? lastRefuseComment;
final DateTime? creeLe;
final DateTime? modifieLe;
const CarteBulle({
required this.id,
required this.typeCode,
required this.titre,
this.couleur,
required this.idPlacement,
this.idAbsence,
this.operation = 'create',
required this.statut,
this.payload = const {},
this.purgeAt,
this.creePar,
this.isCreator = false,
this.responseMode = CarteResponseMode.none,
this.lastRefuseComment,
this.creeLe,
this.modifieLe,
});
String? get dateDebut => payload['date_debut']?.toString();
String? get dateFin => payload['date_fin']?.toString();
String? get motif => payload['motif']?.toString();
/// Libellé UI (sémantique produit) — pas le titre brut API.
String get titreAffiche {
switch (typeCode) {
case 'conge_am':
return 'Demande de congés';
case 'arret_maladie_am':
return 'Arrêt maladie';
case 'absence_enfant':
case 'absence_enfant_modif':
return 'Notification d’absence';
default:
return titre;
}
}
bool get isArretMaladie => typeCode == 'arret_maladie_am';
bool get isCongeAm => typeCode == 'conge_am';
/// Icône dessin (haut droite) selon le type de bulle.
String? get iconAsset {
switch (typeCode) {
case 'conge_am':
return 'assets/images/valise.png';
case 'arret_maladie_am':
return 'assets/images/cartes/icon_carte_maladie.png';
case 'absence_enfant':
case 'absence_enfant_modif':
return 'assets/images/cartes/icon_carte_absence.png';
default:
return null;
}
}
/// Fin de période (jour inclus). Null si dates absentes / invalides.
DateTime? get dateFinJour {
final raw = dateFin;
if (raw == null || raw.isEmpty) return null;
final dt = DateTime.tryParse(raw);
if (dt == null) return null;
return DateTime(dt.year, dt.month, dt.day);
}
/// Vrai tant que la date de fin n’est pas dépassée (jour courant inclus).
bool get periodeEncoreActive {
final fin = dateFinJour;
if (fin == null) return true;
final today = DateTime.now();
final todayDay = DateTime(today.year, today.month, today.day);
return !todayDay.isAfter(fin);
}
/// 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;
default:
return CardColorHorizontal.peach.path;
}
}
/// Le destinataire peut répondre (pas le créateur, carte ouverte).
bool get peutRepondre =>
!isCreator &&
statut == CarteStatut.ouverte &&
responseMode != CarteResponseMode.none;
factory CarteBulle.fromJson(Map<String, dynamic> json) {
final rawPayload = json['payload'];
return CarteBulle(
id: (json['id'] ?? '').toString(),
typeCode: (json['type_code'] ?? '').toString(),
titre: (json['titre'] ?? json['type_code'] ?? 'Carte').toString(),
couleur: json['couleur']?.toString(),
idPlacement: (json['id_placement'] ?? '').toString(),
idAbsence: json['id_absence']?.toString(),
operation: (json['operation'] ?? 'create').toString(),
statut: CarteStatut.fromApi(json['statut']?.toString()),
payload: rawPayload is Map
? Map<String, dynamic>.from(rawPayload)
: const {},
purgeAt: _parseDate(json['purge_at']),
creePar: json['cree_par']?.toString(),
isCreator: json['is_creator'] == true,
responseMode: CarteResponseMode.fromApi(json['response_mode']?.toString()),
lastRefuseComment: json['last_refuse_comment']?.toString(),
creeLe: _parseDate(json['cree_le']),
modifieLe: _parseDate(json['modifie_le']),
);
}
static DateTime? _parseDate(dynamic v) {
if (v == null) return null;
return DateTime.tryParse(v.toString());
}
}
+14 -5
View File
@@ -39,13 +39,15 @@ class CoupleMembre {
class CoupleGarde {
final String id;
final CoupleMembre enfant;
final CoupleMembre am;
final CoupleMembre? am;
final List<CoupleMembre> parents;
final bool courant;
const CoupleGarde({
required this.id,
required this.enfant,
required this.am,
this.am,
this.parents = const [],
this.courant = false,
});
@@ -55,9 +57,15 @@ class CoupleGarde {
enfant: CoupleMembre.fromJson(
Map<String, dynamic>.from(json['enfant'] ?? const {}),
),
am: CoupleMembre.fromJson(
Map<String, dynamic>.from(json['am'] ?? const {}),
),
am: json['am'] != null
? CoupleMembre.fromJson(Map<String, dynamic>.from(json['am']))
: null,
parents: json['parents'] != null
? (json['parents'] as List)
.whereType<Map>()
.map((e) => CoupleMembre.fromJson(Map<String, dynamic>.from(e)))
.toList()
: const [],
courant: json['courant'] == true,
);
}
@@ -67,6 +75,7 @@ class CoupleGarde {
id: id,
enfant: enfant,
am: am,
parents: parents,
courant: courant ?? this.courant,
);
}
+152 -42
View File
@@ -1,11 +1,16 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/widgets/app_footer.dart';
import 'package:p_tits_pas/widgets/dashboard/dashboard_bandeau.dart';
import 'package:p_tits_pas/services/couple_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Dashboard assistante maternelle – page blanche avec bandeau générique.
/// Contenu détaillé à venir.
/// Dashboard assistante maternelle – coquille 3 colonnes quotidien (#169).
/// Colonne gauche : sélecteur de couple enfant–parent(s) (#170).
/// Métier cartes / blog / messagerie : tickets C/D/E.
class AmDashboardScreen extends StatefulWidget {
const AmDashboardScreen({super.key});
@@ -14,13 +19,19 @@ class AmDashboardScreen extends StatefulWidget {
}
class _AmDashboardScreenState extends State<AmDashboardScreen> {
int selectedTabIndex = 0;
QuotidienNavSection _section = QuotidienNavSection.liaison;
AppUser? _user;
List<CoupleGarde> _couples = const [];
String? _selectedCoupleId;
bool _couplesLoading = true;
String? _couplesError;
@override
void initState() {
super.initState();
_loadUser();
_loadCouples();
}
Future<void> _loadUser() async {
@@ -28,51 +39,150 @@ class _AmDashboardScreenState extends State<AmDashboardScreen> {
if (mounted) setState(() => _user = user);
}
Future<void> _loadCouples() async {
setState(() {
_couplesLoading = true;
_couplesError = null;
});
try {
final res = await CoupleGardeService.getAmCouplesGarde();
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id;
_couplesLoading = false;
});
} catch (e) {
if (!mounted) return;
setState(() {
_couplesError = e.toString().replaceFirst('Exception: ', '');
_couplesLoading = false;
});
}
}
Future<void> _selectCouple(CoupleGarde couple) async {
if (couple.id == _selectedCoupleId) return;
setState(() => _selectedCoupleId = couple.id);
try {
final res = await CoupleGardeService.definirAmCoupleCourant(couple.id);
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id ?? couple.id;
});
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
"Impossible de changer d'enfant : "
'${e.toString().replaceFirst('Exception: ', '')}',
),
),
);
}
}
String get _displayName {
final n = _user?.fullName.trim() ?? '';
if (n.isNotEmpty) return n;
final email = _user?.email.trim() ?? '';
if (email.isNotEmpty) return email.split('@').first;
return 'Assistante maternelle';
}
void _soon(String label) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('$label — à venir')),
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: PreferredSize(
preferredSize: const Size.fromHeight(60.0),
child: DashboardBandeau(
tabItems: const [
DashboardTabItem(label: 'Mon tableau de bord'),
DashboardTabItem(label: 'Paramètres'),
],
selectedTabIndex: selectedTabIndex,
onTabSelected: (index) => setState(() => selectedTabIndex = index),
userDisplayName: _user?.fullName.isNotEmpty == true
? _user!.fullName
: 'Assistante maternelle',
userEmail: _user?.email,
userRole: _user?.role,
onProfileTap: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Modification du profil – à venir')),
);
},
onSettingsTap: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Paramètres – à venir')),
);
},
onLogout: () {},
showLogoutConfirmation: true,
),
return QuotidienShell(
selectedSection: _section,
onSectionSelected: (s) => setState(() => _section = s),
userDisplayName: _displayName,
userEmail: _user?.email,
onProfileTap: () => _soon('Profil'),
onSettingsTap: () => _soon('Paramètres'),
// L'AM n'a pas de bouton "Recherche AM" dans le bandeau
onSearchAmTap: null,
leftColumn: _LeftColumn(
couples: _couples,
selectedCoupleId: _selectedCoupleId,
loading: _couplesLoading,
error: _couplesError,
onRetry: _loadCouples,
onCoupleSelected: _selectCouple,
),
body: Column(
centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog',
subtitle:
'Fil du quotidien (affichage par défaut)\n(à brancher — ticket #179).',
icon: Icons.auto_stories_outlined,
),
rightColumn: const QuotidienColumnPlaceholder(
title: 'Messagerie',
subtitle:
'Mess. Parents · Mess. RPE\n(à brancher — ticket #185).',
icon: Icons.chat_bubble_outline,
),
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
contratBody: const QuotidienStubPage(
title: 'Contrat',
message: 'Contrat — contenu à venir (stub #187).',
),
);
}
}
class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId;
final bool loading;
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
const _LeftColumn({
required this.couples,
required this.selectedCoupleId,
required this.loading,
required this.error,
required this.onRetry,
required this.onCoupleSelected,
});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(14),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: Center(
child: Text(
'Dashboard AM – à venir',
style: Theme.of(context).textTheme.titleLarge,
),
CoupleSelectorBandeau(
mode: CoupleBandeauMode.assistanteMaternelle,
couples: couples,
selectedCoupleId: selectedCoupleId,
loading: loading,
errorMessage: error,
onRetry: onRetry,
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
const Expanded(
child: QuotidienColumnPlaceholder(
title: 'Cartes',
subtitle:
'Absences, congés AM, sorties à valider\n(à brancher — ticket #174).',
icon: Icons.style_outlined,
),
),
const AppFooter(),
],
),
);
}
}
@@ -41,6 +41,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
CardColorVertical.red,
CardColorVertical.green,
CardColorVertical.blue,
CardColorVertical.aqua,
];
// Garder une trace des couleurs déjà utilisées
@@ -3,13 +3,14 @@ import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/couple_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/cartes_feed.dart';
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
/// Colonne gauche : sélecteur de couple enfant–nounou (#167).
/// Métier cartes / blog / messagerie : tickets C/D/E.
/// Colonne gauche : sélecteur de couple (#167) + feed bulles (#173).
class ParentDashboardScreen extends StatefulWidget {
const ParentDashboardScreen({super.key});
@@ -62,7 +63,6 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
Future<void> _selectCouple(CoupleGarde couple) async {
if (couple.id == _selectedCoupleId) return;
// Optimiste : on bascule tout de suite, l'API persiste ensuite.
setState(() => _selectedCoupleId = couple.id);
try {
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
@@ -115,6 +115,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
error: _couplesError,
onRetry: _loadCouples,
onCoupleSelected: _selectCouple,
onAjouterBulle: () => _soon('Ajouter une bulle'),
),
centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog',
@@ -128,10 +129,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
icon: Icons.chat_bubble_outline,
),
agendaBody: const QuotidienStubPage(
title: 'Agenda',
message: 'Agenda — contenu à venir (stub #187).',
),
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
contratBody: const QuotidienStubPage(
title: 'Contrat',
message: 'Contrat — contenu à venir (stub #187).',
@@ -140,7 +138,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
}
}
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173 à venir).
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173).
class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId;
@@ -148,6 +146,7 @@ class _LeftColumn extends StatelessWidget {
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
final VoidCallback onAjouterBulle;
const _LeftColumn({
required this.couples,
@@ -156,6 +155,7 @@ class _LeftColumn extends StatelessWidget {
required this.error,
required this.onRetry,
required this.onCoupleSelected,
required this.onAjouterBulle,
});
@override
@@ -174,12 +174,10 @@ class _LeftColumn extends StatelessWidget {
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
const Expanded(
child: QuotidienColumnPlaceholder(
title: 'Cartes',
subtitle:
'Absences, congés AM, sorties à valider\n(à brancher — ticket #173).',
icon: Icons.style_outlined,
Expanded(
child: CartesFeed(
placementId: selectedCoupleId,
onAjouterBulle: onAjouterBulle,
),
),
],
@@ -0,0 +1,192 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/absence_garde.dart';
import 'package:p_tits_pas/services/api/absences_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
class AgendaAbsencesStub extends StatefulWidget {
final String? placementId;
const AgendaAbsencesStub({super.key, this.placementId});
@override
State<AgendaAbsencesStub> createState() => _AgendaAbsencesStubState();
}
class _AgendaAbsencesStubState extends State<AgendaAbsencesStub> {
List<AbsenceGarde> _absences = [];
bool _loading = true;
String? _error;
@override
void initState() {
super.initState();
_loadAbsences();
}
@override
void didUpdateWidget(covariant AgendaAbsencesStub oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.placementId != widget.placementId) {
_loadAbsences();
}
}
Future<void> _loadAbsences() async {
setState(() {
_loading = true;
_error = null;
});
try {
final absences = await AbsencesGardeService.getAbsences(
placementId: widget.placementId,
);
if (!mounted) return;
setState(() {
_absences = absences;
_loading = false;
});
} catch (e) {
if (!mounted) return;
setState(() {
_error = e.toString();
_loading = false;
});
}
}
@override
Widget build(BuildContext context) {
return Container(
color: QuotidienTheme.ivory,
child: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 600),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Icon(
Icons.calendar_month_outlined,
size: 64,
color: QuotidienTheme.peach,
),
const SizedBox(height: 24),
Text(
"Agenda (Stub) - Lignes d'absence",
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
color: QuotidienTheme.ink,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 12),
Text(
'ID Placement courant: ${widget.placementId ?? 'Tous'}',
textAlign: TextAlign.center,
style: const TextStyle(color: QuotidienTheme.muted),
),
const SizedBox(height: 24),
Expanded(
child: _buildList(),
),
],
),
),
),
);
}
Widget _buildList() {
if (_loading) {
return const Center(child: CircularProgressIndicator());
}
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.error_outline, color: Colors.red, size: 48),
const SizedBox(height: 16),
Text(_error!, style: const TextStyle(color: Colors.red)),
const SizedBox(height: 16),
ElevatedButton(
onPressed: _loadAbsences,
child: const Text('Réessayer'),
),
],
),
);
}
if (_absences.isEmpty) {
return const Center(
child: Text('Aucune absence ou congé trouvé.',
style: TextStyle(color: QuotidienTheme.muted)),
);
}
return ListView.separated(
itemCount: _absences.length,
separatorBuilder: (_, __) => const Divider(),
itemBuilder: (context, index) {
final abs = _absences[index];
return ListTile(
leading: _getIcon(abs.type),
title: Text('${abs.type} (${abs.statut})'),
subtitle: Text(
'Du ${abs.dateDebut} au ${abs.dateFin}\n'
'Enfant: ${abs.prenomEnfant ?? 'N/A'}, AM: ${abs.prenomAm ?? 'N/A'}',
),
trailing: IconButton(
icon: const Icon(Icons.delete_outline, color: Colors.red),
onPressed: () => _confirmDelete(abs),
),
);
},
);
}
Icon _getIcon(String type) {
switch (type) {
case 'absence_enfant':
return const Icon(Icons.child_care, color: QuotidienTheme.coral);
case 'conge_am':
return const Icon(Icons.beach_access, color: QuotidienTheme.turquoise);
case 'arret_maladie_am':
return const Icon(Icons.medical_services, color: QuotidienTheme.coral);
default:
return const Icon(Icons.event);
}
}
Future<void> _confirmDelete(AbsenceGarde abs) async {
final confirm = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Supprimer ?'),
content: Text("Supprimer l'absence ${abs.type} du ${abs.dateDebut} ?"),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('Annuler'),
),
TextButton(
onPressed: () => Navigator.pop(context, true),
style: TextButton.styleFrom(foregroundColor: Colors.red),
child: const Text('Supprimer'),
),
],
),
);
if (confirm == true) {
try {
await AbsencesGardeService.supprimerAbsence(abs.id);
_loadAbsences();
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Erreur: $e')),
);
}
}
}
}
@@ -0,0 +1,94 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:p_tits_pas/models/absence_garde.dart';
import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/services/api/tokenService.dart';
class AbsencesGardeService {
static Future<List<AbsenceGarde>> getAbsences({String? placementId}) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse(ApiConfig.baseUrl +
'/absences-garde' +
(placementId != null ? '?placementId=$placementId' : ''));
final res = await http.get(uri, headers: headers);
if (res.statusCode == 200) {
final json = jsonDecode(res.body);
final List items = json['items'] ?? [];
return items.map((e) => AbsenceGarde.fromJson(e)).toList();
} else {
throw Exception('Erreur de chargement des absences : ${res.statusCode}');
}
}
static Future<AbsenceGarde> creerAbsence({
required String idPlacement,
required String type,
required String dateDebut,
required String dateFin,
String? motif,
}) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde');
final res = await http.post(
uri,
headers: headers,
body: jsonEncode({
'id_placement': idPlacement,
'type': type,
'date_debut': dateDebut,
'date_fin': dateFin,
if (motif != null) 'motif': motif,
}),
);
if (res.statusCode == 201) {
return AbsenceGarde.fromJson(jsonDecode(res.body));
} else {
throw Exception("Erreur de création d'absence : ${res.statusCode}");
}
}
static Future<AbsenceGarde> modifierAbsence(
String id, {
String? dateDebut,
String? dateFin,
String? statut,
String? motif,
}) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
final Map<String, dynamic> body = {};
if (dateDebut != null) body['date_debut'] = dateDebut;
if (dateFin != null) body['date_fin'] = dateFin;
if (statut != null) body['statut'] = statut;
if (motif != null) body['motif'] = motif;
final res = await http.patch(
uri,
headers: headers,
body: jsonEncode(body),
);
if (res.statusCode == 200) {
return AbsenceGarde.fromJson(jsonDecode(res.body));
} else {
throw Exception("Erreur de modification d'absence : ${res.statusCode}");
}
}
static Future<void> supprimerAbsence(String id) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
final res = await http.delete(uri, headers: headers);
if (res.statusCode != 204) {
throw Exception("Erreur de suppression d'absence : ${res.statusCode}");
}
}
}
+11 -2
View File
@@ -67,7 +67,11 @@ class ApiConfig {
static const String parentsCoupleGardeCourant =
'/parents/me/couples-garde/courant';
static const String assistantesMaternelles = '/assistantes-maternelles';
/// Création dossier AM actif par le staff (#156) — body type register AM.
/// Couples de garde de l'AM connectée (#170 / #171).
static const String assistantesMaternellesCouplesGarde =
'/assistantes-maternelles/me/couples-garde';
static const String assistantesMaternellesCoupleGardeCourant =
'/assistantes-maternelles/me/couples-garde/courant';
static const String assistantesMaternellesDossier =
'/assistantes-maternelles/dossier';
static const String enfants = '/enfants';
@@ -89,6 +93,10 @@ class ApiConfig {
static const String conversations = '/conversations';
static const String notifications = '/notifications';
/// File d'attention / bulles (#173 / #194).
static const String cards = '/cards';
static const String cardsStream = '/cards/stream';
// Headers
static Map<String, String> get headers => {
'Content-Type': 'application/json',
@@ -96,7 +104,8 @@ class ApiConfig {
};
static Map<String, String> authHeaders(String token) => {
...headers,
'Content-Type': 'application/json',
'Accept': 'application/json',
'Authorization': 'Bearer $token',
};
}
@@ -0,0 +1,87 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:p_tits_pas/models/carte_bulle.dart';
import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/services/api/tokenService.dart';
/// Accès API Cartes (file d'attention) — tickets #173 / #194.
/// - GET /cards?placementId=
/// - POST /cards/:id/respond
class CardsService {
static Future<Map<String, String>> _headers() async {
final token = await TokenService.getToken();
return token != null
? ApiConfig.authHeaders(token)
: Map<String, String>.from(ApiConfig.headers);
}
static String _extractError(String body, String fallback) {
try {
final decoded = jsonDecode(body);
if (decoded is Map<String, dynamic>) {
final message = decoded['message'];
if (message is String && message.trim().isNotEmpty) {
return message;
}
if (message is Map && message['message'] is String) {
return message['message'] as String;
}
}
} catch (_) {}
return fallback;
}
/// Feed de bulles pour l'utilisateur (filtré par couple / placement).
static Future<List<CarteBulle>> lister({String? placementId}) async {
final query = <String, String>{};
if (placementId != null && placementId.isNotEmpty) {
query['placementId'] = placementId;
}
final uri = Uri.parse(
'${ApiConfig.baseUrl}${ApiConfig.cards}',
).replace(queryParameters: query.isEmpty ? null : query);
final response = await http.get(uri, headers: await _headers());
if (response.statusCode != 200) {
throw Exception(
_extractError(response.body, 'Erreur chargement des cartes'),
);
}
final decoded = jsonDecode(response.body);
final list = (decoded is Map ? decoded['items'] as List? : null) ?? const [];
return list
.whereType<Map>()
.map((e) => CarteBulle.fromJson(Map<String, dynamic>.from(e)))
.toList();
}
/// Répondre : accept | refuse | ack.
static Future<CarteBulle> repondre({
required String cardId,
required String action,
String? comment,
}) async {
final response = await http.post(
Uri.parse(
'${ApiConfig.baseUrl}${ApiConfig.cards}/$cardId/respond',
),
headers: await _headers(),
body: jsonEncode({
'action': action,
if (comment != null && comment.trim().isNotEmpty)
'comment': comment.trim(),
}),
);
if (response.statusCode != 200) {
throw Exception(
_extractError(response.body, 'Erreur lors de la réponse'),
);
}
final decoded = jsonDecode(response.body);
return CarteBulle.fromJson(Map<String, dynamic>.from(decoded as Map));
}
}
+7
View File
@@ -383,6 +383,13 @@ class AuthService {
}
/// Récupère l'utilisateur connecté depuis le cache
static const String tokenKey = 'auth_token';
static Future<String?> getToken() async {
final prefs = await SharedPreferences.getInstance();
return prefs.getString(tokenKey);
}
static Future<AppUser?> getCurrentUser() async {
final prefs = await SharedPreferences.getInstance();
final userJson = prefs.getString(_currentUserKey);
@@ -73,4 +73,45 @@ class CoupleGardeService {
Map<String, dynamic>.from(decoded as Map),
);
}
/// Liste les couples de garde et le couple courant de l'AM connectée.
static Future<CouplesGardeResponse> getAmCouplesGarde() async {
final response = await http.get(
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.assistantesMaternellesCouplesGarde}'),
headers: await _headers(),
);
if (response.statusCode != 200) {
throw Exception(
_extractError(response.body, 'Erreur chargement des couples de garde (AM)'),
);
}
final decoded = jsonDecode(response.body);
return CouplesGardeResponse.fromJson(
Map<String, dynamic>.from(decoded as Map),
);
}
/// Persiste le couple courant (AM) et renvoie la liste à jour.
static Future<CouplesGardeResponse> definirAmCoupleCourant(
String coupleId,
) async {
final response = await http.put(
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.assistantesMaternellesCoupleGardeCourant}'),
headers: await _headers(),
body: jsonEncode({'couple_id': coupleId}),
);
if (response.statusCode != 200) {
throw Exception(
_extractError(response.body, 'Erreur sélection du couple de garde (AM)'),
);
}
final decoded = jsonDecode(response.body);
return CouplesGardeResponse.fromJson(
Map<String, dynamic>.from(decoded as Map),
);
}
}
+1
View File
@@ -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;
}
}
+9 -3
View File
@@ -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;
}
}
}
+251
View File
@@ -0,0 +1,251 @@
import 'dart:ui' as ui;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
/// Mode d’extension du fond pastel.
enum CarteStretch {
/// 9 zones (bulles / cartes content).
both,
/// Uniquement horizontal — bouts en demi-cercle (bandeau couple).
horizontal,
}
/// Fond pastel extensible (capacité par défaut des « cartes » UI).
///
/// Coins / bouts à taille logique fixe ; le reste s’étire selon [stretch].
class Carte extends StatefulWidget {
final String assetPath;
final CarteStretch stretch;
final Rect centerSlice;
final double cornerWidth;
final double cornerHeight;
final Widget? child;
final EdgeInsetsGeometry? padding;
final BoxConstraints? constraints;
final double? width;
final double? height;
/// Carte / bulle content (`card_*_h.png`, ~1024×512).
const Carte({
super.key,
required this.assetPath,
this.child,
this.padding,
this.constraints,
this.width,
this.height,
this.stretch = CarteStretch.both,
this.centerSlice = const Rect.fromLTRB(160, 90, 864, 422),
this.cornerWidth = 56,
this.cornerHeight = 40,
});
/// Bandeau couple enfant / nounou (`bandeau_*.png`, ~1024×160).
/// Étirement horizontal seul pour garder les bouts ronds.
const Carte.bandeau({
super.key,
required this.assetPath,
this.child,
this.padding,
this.constraints,
this.width,
this.height,
}) : stretch = CarteStretch.horizontal,
// Demi-cercle source ≈ moitié de la hauteur (160/2 = 80).
centerSlice = const Rect.fromLTRB(80, 0, 944, 160),
cornerWidth = 45,
cornerHeight = 45;
@override
State<Carte> createState() => _CarteState();
}
class _CarteImageCache {
static final Map<String, Future<ui.Image>> _futures = {};
static Future<ui.Image> load(String path) {
return _futures.putIfAbsent(path, () async {
final data = await rootBundle.load(path);
final codec = await ui.instantiateImageCodec(
data.buffer.asUint8List(),
);
final frame = await codec.getNextFrame();
return frame.image;
});
}
}
class _CarteState extends State<Carte> {
ui.Image? _image;
String? _loadedPath;
@override
void initState() {
super.initState();
_load();
}
@override
void didUpdateWidget(covariant Carte oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.assetPath != widget.assetPath) {
_load();
}
}
Future<void> _load() async {
final path = widget.assetPath;
final image = await _CarteImageCache.load(path);
if (!mounted) return;
setState(() {
_image = image;
_loadedPath = path;
});
}
@override
Widget build(BuildContext context) {
final img = _image;
final ready = img != null && _loadedPath == widget.assetPath;
return SizedBox(
width: widget.width,
height: widget.height,
child: Container(
constraints: widget.constraints,
child: CustomPaint(
painter: ready
? _CartePainter(
image: img!,
stretch: widget.stretch,
centerSlice: widget.centerSlice,
cornerWidth: widget.cornerWidth,
cornerHeight: widget.cornerHeight,
)
: null,
child: Padding(
padding: widget.padding ?? EdgeInsets.zero,
child: widget.child,
),
),
),
);
}
}
class _CartePainter extends CustomPainter {
final ui.Image image;
final CarteStretch stretch;
final Rect centerSlice;
final double cornerWidth;
final double cornerHeight;
_CartePainter({
required this.image,
required this.stretch,
required this.centerSlice,
required this.cornerWidth,
required this.cornerHeight,
});
@override
void paint(Canvas canvas, Size size) {
if (size.width <= 0 || size.height <= 0) return;
final paint = Paint()..filterQuality = FilterQuality.high;
final srcW = image.width.toDouble();
final srcH = image.height.toDouble();
void draw(Rect src, Rect dst) {
if (src.width <= 0 || src.height <= 0) return;
if (dst.width <= 0 || dst.height <= 0) return;
canvas.drawImageRect(image, src, dst, paint);
}
if (stretch == CarteStretch.horizontal) {
// 3 bandes pleine hauteur : bout | milieu | bout (pilule).
// Largeur du bout = moitié de la hauteur → demi-cercle propre.
final tip = (size.height / 2).clamp(1.0, size.width / 2);
final srcTip = centerSlice.left.clamp(1.0, srcW / 2);
final midW = (size.width - tip * 2).clamp(0.0, size.width);
draw(
Rect.fromLTWH(0, 0, srcTip, srcH),
Rect.fromLTWH(0, 0, tip, size.height),
);
draw(
Rect.fromLTWH(srcTip, 0, (srcW - srcTip * 2).clamp(1.0, srcW), srcH),
Rect.fromLTWH(tip, 0, midW, size.height),
);
draw(
Rect.fromLTWH(srcW - srcTip, 0, srcTip, srcH),
Rect.fromLTWH(tip + midW, 0, tip, size.height),
);
return;
}
// 9 zones (bulles).
final srcLeft = centerSlice.left.clamp(0.0, srcW);
final srcTop = centerSlice.top.clamp(0.0, srcH);
final srcRight = centerSlice.right.clamp(0.0, srcW);
final srcBottom = centerSlice.bottom.clamp(0.0, srcH);
final srcLeftW = srcLeft;
final srcTopH = srcTop;
final srcRightW = srcW - srcRight;
final srcBottomH = srcH - srcBottom;
final srcCenterW = (srcRight - srcLeft).clamp(1.0, srcW);
final srcCenterH = (srcBottom - srcTop).clamp(1.0, srcH);
final dstLeftW = cornerWidth.clamp(1.0, size.width / 2);
final dstRightW = cornerWidth.clamp(1.0, size.width / 2);
final dstTopH = cornerHeight.clamp(1.0, size.height / 2);
final dstBottomH = cornerHeight.clamp(1.0, size.height / 2);
final dstCenterW =
(size.width - dstLeftW - dstRightW).clamp(0.0, size.width);
final dstCenterH =
(size.height - dstTopH - dstBottomH).clamp(0.0, size.height);
// Haut
draw(Rect.fromLTWH(0, 0, srcLeftW, srcTopH),
Rect.fromLTWH(0, 0, dstLeftW, dstTopH));
draw(Rect.fromLTWH(srcLeft, 0, srcCenterW, srcTopH),
Rect.fromLTWH(dstLeftW, 0, dstCenterW, dstTopH));
draw(Rect.fromLTWH(srcRight, 0, srcRightW, srcTopH),
Rect.fromLTWH(dstLeftW + dstCenterW, 0, dstRightW, dstTopH));
// Milieu
draw(Rect.fromLTWH(0, srcTop, srcLeftW, srcCenterH),
Rect.fromLTWH(0, dstTopH, dstLeftW, dstCenterH));
draw(Rect.fromLTWH(srcLeft, srcTop, srcCenterW, srcCenterH),
Rect.fromLTWH(dstLeftW, dstTopH, dstCenterW, dstCenterH));
draw(Rect.fromLTWH(srcRight, srcTop, srcRightW, srcCenterH),
Rect.fromLTWH(dstLeftW + dstCenterW, dstTopH, dstRightW, dstCenterH));
// Bas
draw(Rect.fromLTWH(0, srcBottom, srcLeftW, srcBottomH),
Rect.fromLTWH(0, dstTopH + dstCenterH, dstLeftW, dstBottomH));
draw(Rect.fromLTWH(srcLeft, srcBottom, srcCenterW, srcBottomH),
Rect.fromLTWH(dstLeftW, dstTopH + dstCenterH, dstCenterW, dstBottomH));
draw(
Rect.fromLTWH(srcRight, srcBottom, srcRightW, srcBottomH),
Rect.fromLTWH(
dstLeftW + dstCenterW,
dstTopH + dstCenterH,
dstRightW,
dstBottomH,
),
);
}
@override
bool shouldRepaint(covariant _CartePainter oldDelegate) {
return oldDelegate.image != image ||
oldDelegate.stretch != stretch ||
oldDelegate.centerSlice != centerSlice ||
oldDelegate.cornerWidth != cornerWidth ||
oldDelegate.cornerHeight != cornerHeight;
}
}
@@ -0,0 +1,881 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:p_tits_pas/models/carte_bulle.dart';
import 'package:p_tits_pas/services/api/cards_service.dart';
import 'package:p_tits_pas/widgets/quotidien/carte.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
/// Feed de bulles (file d'attention) — ticket #173.
/// Widget partagé parent / AM ; les actions dépendent du rôle + payload API.
class CartesFeed extends StatefulWidget {
final String? placementId;
final VoidCallback? onAjouterBulle;
const CartesFeed({
super.key,
this.placementId,
this.onAjouterBulle,
});
@override
State<CartesFeed> createState() => _CartesFeedState();
}
class _CartesFeedState extends State<CartesFeed> {
static const double _fadeExtent = 0.08;
List<CarteBulle> _items = const [];
bool _loading = true;
String? _error;
String? _busyCardId;
final ScrollController _scrollController = ScrollController();
bool _isScrollable = false;
bool _fadeTop = false;
bool _fadeBottom = false;
@override
void initState() {
super.initState();
_scrollController.addListener(_syncScrollFades);
_load();
}
@override
void dispose() {
_scrollController.removeListener(_syncScrollFades);
_scrollController.dispose();
super.dispose();
}
@override
void didUpdateWidget(covariant CartesFeed oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.placementId != widget.placementId) {
_load();
}
}
void _syncScrollFades() {
if (!_scrollController.hasClients) return;
final position = _scrollController.position;
final scrollable = position.maxScrollExtent > 0.0;
final threshold = position.viewportDimension * _fadeExtent / 2;
final fadeTop = scrollable && position.pixels > threshold;
final fadeBottom = scrollable &&
position.pixels < (position.maxScrollExtent - threshold);
if (scrollable != _isScrollable ||
fadeTop != _fadeTop ||
fadeBottom != _fadeBottom) {
setState(() {
_isScrollable = scrollable;
_fadeTop = fadeTop;
_fadeBottom = fadeBottom;
});
}
}
Future<void> _load() async {
setState(() {
_loading = true;
_error = null;
});
try {
final items = await CardsService.lister(
placementId: widget.placementId,
);
if (!mounted) return;
setState(() {
_items = items;
_loading = false;
});
WidgetsBinding.instance.addPostFrameCallback((_) => _syncScrollFades());
} catch (e) {
if (!mounted) return;
setState(() {
_error = e.toString().replaceFirst('Exception: ', '');
_loading = false;
});
}
}
Future<void> _respond(
CarteBulle card, {
required String action,
String? comment,
}) async {
setState(() => _busyCardId = card.id);
try {
final updated = await CardsService.repondre(
cardId: card.id,
action: action,
comment: comment,
);
if (!mounted) return;
setState(() {
_items = [
for (final c in _items) if (c.id == updated.id) updated else c,
];
_busyCardId = null;
});
} catch (e) {
if (!mounted) return;
setState(() => _busyCardId = null);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(e.toString().replaceFirst('Exception: ', '')),
),
);
}
}
Future<void> _onAccept(CarteBulle card) async {
final ok = await showDialog<bool>(
context: context,
builder: (ctx) => AlertDialog(
title: Text(
'Accepter la demande ?',
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
),
content: Text(
'Confirmez-vous l’acceptation de « ${card.titreAffiche} » '
'(${_periodeCourte(card)}) ?',
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx, false),
child: const Text('Annuler'),
),
FilledButton(
onPressed: () => Navigator.pop(ctx, true),
child: const Text('Confirmer'),
),
],
),
);
if (ok == true) {
await _respond(card, action: 'accept');
}
}
Future<void> _onAck(CarteBulle card) async {
final ok = await showDialog<bool>(
context: context,
builder: (ctx) => AlertDialog(
title: Text(
'Prise en compte',
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
),
content: Text(
'Confirmez-vous avoir bien reçu cet arrêt maladie '
'(${_periodeCourte(card)}) ?',
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx, false),
child: const Text('Annuler'),
),
FilledButton(
onPressed: () => Navigator.pop(ctx, true),
child: const Text('Bien reçu'),
),
],
),
);
if (ok == true) {
await _respond(card, action: 'ack');
}
}
Future<void> _onRefuse(CarteBulle card) async {
final controller = TextEditingController();
final ok = await showDialog<bool>(
context: context,
builder: (ctx) => AlertDialog(
title: Text(
'Refuser la demande',
style: GoogleFonts.merienda(fontWeight: FontWeight.w600),
),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'Indiquez le motif du refus pour « ${card.titreAffiche} ».',
style: GoogleFonts.merriweather(fontSize: 14, height: 1.4),
),
const SizedBox(height: 12),
TextField(
controller: controller,
maxLines: 3,
autofocus: true,
decoration: const InputDecoration(
hintText: 'Motif du refus…',
border: OutlineInputBorder(),
),
),
],
),
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx, false),
child: const Text('Annuler'),
),
FilledButton(
onPressed: () {
if (controller.text.trim().isEmpty) return;
Navigator.pop(ctx, true);
},
child: const Text('Refuser'),
),
],
),
);
if (ok == true && controller.text.trim().isNotEmpty) {
await _respond(
card,
action: 'refuse',
comment: controller.text.trim(),
);
}
controller.dispose();
}
static String _periodeCourte(CarteBulle card) {
final d = card.dateDebut;
final f = card.dateFin;
String fmt(String? iso) {
if (iso == null || iso.isEmpty) return '…';
final dt = DateTime.tryParse(iso);
if (dt == null) return iso;
return '${dt.day.toString().padLeft(2, '0')}/'
'${dt.month.toString().padLeft(2, '0')}/${dt.year}';
}
if (d == null && f == null) return 'période non précisée';
if (d != null && f != null && d == f) return fmt(d);
return '${fmt(d)} → ${fmt(f)}';
}
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
const Icon(
Icons.style_outlined,
color: QuotidienTheme.lavender,
size: 22,
),
const SizedBox(width: 8),
Text(
'Cartes',
style: GoogleFonts.merienda(
fontSize: 18,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
),
),
const Spacer(),
TextButton.icon(
onPressed: widget.onAjouterBulle,
icon: const Icon(Icons.add, size: 18),
label: Text(
'Ajouter',
style: GoogleFonts.merriweather(fontSize: 13),
),
),
],
),
const SizedBox(height: 8),
Expanded(child: _buildBody()),
],
);
}
Widget _buildBody() {
if (_loading) {
return const Center(
child: SizedBox(
width: 28,
height: 28,
child: CircularProgressIndicator(strokeWidth: 2),
),
);
}
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
_error!,
textAlign: TextAlign.center,
style: GoogleFonts.merriweather(
fontSize: 13,
color: QuotidienTheme.ink,
),
),
const SizedBox(height: 8),
TextButton(onPressed: _load, child: const Text('Réessayer')),
],
),
);
}
if (_items.isEmpty) {
return Center(
child: Text(
'Aucune bulle pour le moment.\nLa file d’attention est vide — c’est normal.',
textAlign: TextAlign.center,
style: GoogleFonts.merriweather(
fontSize: 13,
color: QuotidienTheme.muted,
height: 1.4,
),
),
);
}
return NotificationListener<ScrollMetricsNotification>(
onNotification: (_) {
_syncScrollFades();
return false;
},
child: ShaderMask(
blendMode: BlendMode.dstIn,
shaderCallback: (Rect bounds) {
final stops = <double>[
0.0,
_fadeExtent,
1.0 - _fadeExtent,
1.0,
];
if (!_isScrollable) {
return const LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: <Color>[
Colors.black,
Colors.black,
Colors.black,
Colors.black,
],
stops: [0.0, 0.08, 0.92, 1.0],
).createShader(bounds);
}
final topMask = _fadeTop ? Colors.transparent : Colors.black;
final bottomMask = _fadeBottom ? Colors.transparent : Colors.black;
return LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: <Color>[
topMask,
Colors.black,
Colors.black,
bottomMask,
],
stops: stops,
).createShader(bounds);
},
child: RefreshIndicator(
onRefresh: _load,
child: ListView.separated(
controller: _scrollController,
padding: const EdgeInsets.only(top: 4, bottom: 8),
itemCount: _items.length,
separatorBuilder: (_, __) => const SizedBox(height: 10),
itemBuilder: (context, index) {
final card = _items[index];
return _BulleTile(
card: card,
busy: _busyCardId == card.id,
onAccept: () => _onAccept(card),
onAck: () => _onAck(card),
onRefuse: () => _onRefuse(card),
);
},
),
),
),
);
}
}
class _BulleTile extends StatelessWidget {
/// Encre aqua foncé — harmonisée fond aqua / valise (pas le violet).
static const Color _aquaInk = Color(0xFF315F63);
/// Date : même famille, ~12 % plus claire.
static const Color _aquaDate = Color(0xFF4A7276);
/// Lien agenda : légère dérive bleue.
static const Color _aquaLink = Color(0xFF2B5868);
final CarteBulle card;
final bool busy;
final VoidCallback onAccept;
final VoidCallback onAck;
final VoidCallback onRefuse;
const _BulleTile({
required this.card,
required this.busy,
required this.onAccept,
required this.onAck,
required this.onRefuse,
});
static const _mois = [
'janvier',
'février',
'mars',
'avril',
'mai',
'juin',
'juillet',
'août',
'septembre',
'octobre',
'novembre',
'décembre',
];
String _fmtLong(String? iso) {
if (iso == null || iso.isEmpty) return '…';
final dt = DateTime.tryParse(iso);
if (dt == null) return iso;
final jj = dt.day.toString().padLeft(2, '0');
return '$jj ${_mois[dt.month - 1]} ${dt.year}';
}
/// Une ligne type maquette : « Du 04 au 06 novembre 2026 ».
String _fmtPeriodeUneLigne() {
final d1 = DateTime.tryParse(card.dateDebut ?? '');
final d2 = DateTime.tryParse(card.dateFin ?? '');
if (d1 == null && d2 == null) return '';
if (d1 != null && d2 == null) return 'Le ${_fmtLong(card.dateDebut)}';
if (d1 == null && d2 != null) return 'Au ${_fmtLong(card.dateFin)}';
final a = d1!;
final b = d2!;
final j1 = a.day.toString().padLeft(2, '0');
final j2 = b.day.toString().padLeft(2, '0');
if (a.year == b.year && a.month == b.month && a.day == b.day) {
return 'Le $j1 ${_mois[a.month - 1]} ${a.year}';
}
if (a.year == b.year && a.month == b.month) {
return 'Du $j1 au $j2 ${_mois[a.month - 1]} ${a.year}';
}
if (a.year == b.year) {
return 'Du $j1 ${_mois[a.month - 1]} au $j2 ${_mois[b.month - 1]} ${a.year}';
}
return 'Du $j1 ${_mois[a.month - 1]} ${a.year} '
'au $j2 ${_mois[b.month - 1]} ${b.year}';
}
/// Arrêt maladie : reste opaque tant que la période n’est pas finie.
bool get _attenuee {
if (card.isArretMaladie && card.periodeEncoreActive) return false;
return card.statut == CarteStatut.traitee;
}
@override
Widget build(BuildContext context) {
if (card.isCongeAm) return _buildConge(context);
return _buildGeneric(context);
}
Widget _buildConge(BuildContext context) {
final periode = _fmtPeriodeUneLigne();
return Opacity(
opacity: _attenuee ? 0.55 : 1,
child: Carte(
assetPath: card.backgroundAsset,
constraints: const BoxConstraints(minHeight: 140),
padding: const EdgeInsets.fromLTRB(22, 18, 18, 14),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
card.titreAffiche,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merienda(
fontSize: 18,
fontWeight: FontWeight.w700,
color: _aquaInk,
),
),
if (periode.isNotEmpty) ...[
const SizedBox(height: 10),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
'assets/images/cartes/icon_calendrier_crayon.png',
width: 28,
height: 28,
fit: BoxFit.contain,
filterQuality: FilterQuality.high,
),
const SizedBox(width: 8),
Expanded(
child: Text(
periode,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merienda(
fontSize: 15,
fontWeight: FontWeight.w600,
color: _aquaDate,
height: 1.25,
),
),
),
],
),
],
if (card.statut == CarteStatut.refusee) ...[
const SizedBox(height: 8),
Text(
card.lastRefuseComment != null &&
card.lastRefuseComment!.trim().isNotEmpty
? 'Refusé — ${card.lastRefuseComment}'
: 'Refusé',
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merriweather(
fontSize: 12,
fontStyle: FontStyle.italic,
color: _aquaInk,
),
),
] else if (card.statut == CarteStatut.ouverte &&
card.isCreator) ...[
const SizedBox(height: 8),
Text(
'En attente de réponse',
style: GoogleFonts.merriweather(
fontSize: 12,
color: QuotidienTheme.muted,
),
),
],
],
),
),
if (card.iconAsset != null) ...[
const SizedBox(width: 8),
Image.asset(
card.iconAsset!,
width: 72,
height: 72,
fit: BoxFit.contain,
filterQuality: FilterQuality.high,
),
],
],
),
const SizedBox(height: 10),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
if (card.peutRepondre)
busy
? const SizedBox(
width: 28,
height: 28,
child: CircularProgressIndicator(strokeWidth: 2),
)
: Row(
mainAxisSize: MainAxisSize.min,
children: [
_PilulePeinteButton(
asset:
'assets/images/cartes/btn_coche_pilule.png',
tooltip: 'Accepter',
onTap: onAccept,
),
const SizedBox(width: 10),
_PilulePeinteButton(
asset:
'assets/images/cartes/btn_croix_pilule.png',
tooltip: 'Refuser',
onTap: onRefuse,
),
],
),
const Spacer(),
InkWell(
onTap: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Agenda — à venir.'),
duration: Duration(seconds: 2),
),
);
},
borderRadius: BorderRadius.circular(6),
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 4,
vertical: 4,
),
child: Text(
'Ouvrir dans l’agenda ↗',
style: GoogleFonts.merienda(
fontSize: 13,
fontWeight: FontWeight.w600,
color: _aquaLink,
decoration: TextDecoration.underline,
decorationColor: _aquaLink,
),
),
),
),
],
),
],
),
),
);
}
Widget _buildGeneric(BuildContext context) {
final memeJour = card.dateDebut != null &&
card.dateFin != null &&
card.dateDebut == card.dateFin;
return Opacity(
opacity: _attenuee ? 0.55 : 1,
child: Carte(
assetPath: card.backgroundAsset,
constraints: const BoxConstraints(minHeight: 120),
padding: const EdgeInsets.fromLTRB(22, 16, 22, 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
card.titreAffiche,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merienda(
fontSize: 18,
fontWeight: FontWeight.w700,
color: QuotidienTheme.ink,
),
),
if (card.dateDebut != null || card.dateFin != null) ...[
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.only(left: 12),
child: memeJour
? Text(
'Le ${_fmtLong(card.dateDebut)}',
style: GoogleFonts.merienda(
fontSize: 17,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
height: 1.35,
),
)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Du ${_fmtLong(card.dateDebut)}',
style: GoogleFonts.merienda(
fontSize: 17,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
height: 1.35,
),
),
Text(
'Au ${_fmtLong(card.dateFin)}',
style: GoogleFonts.merienda(
fontSize: 17,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
height: 1.35,
),
),
],
),
),
],
],
),
),
if (card.iconAsset != null) ...[
const SizedBox(width: 10),
Image.asset(
card.iconAsset!,
width: 80,
height: 80,
fit: BoxFit.contain,
filterQuality: FilterQuality.high,
),
],
],
),
if (card.statut == CarteStatut.refusee) ...[
const SizedBox(height: 6),
Text(
card.lastRefuseComment != null &&
card.lastRefuseComment!.trim().isNotEmpty
? 'Refusé — ${card.lastRefuseComment}'
: 'Refusé',
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merriweather(
fontSize: 12,
fontStyle: FontStyle.italic,
color: QuotidienTheme.ink,
),
),
] else if (card.statut == CarteStatut.ouverte &&
card.isCreator) ...[
const SizedBox(height: 6),
Text(
'En attente de réponse',
style: GoogleFonts.merriweather(
fontSize: 12,
color: QuotidienTheme.muted,
),
),
],
if (card.peutRepondre) ...[
const SizedBox(height: 14),
if (busy)
const Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
)
else if (card.responseMode == CarteResponseMode.acceptRefuse)
Row(
children: [
Expanded(
child: _ActionPill(
asset: QuotidienTheme.pillTurquoiseAsset,
iconAsset: 'assets/images/coche.png',
tooltip: 'Accepter',
onTap: onAccept,
),
),
const SizedBox(width: 12),
Expanded(
child: _ActionPill(
asset: QuotidienTheme.pillCorailAsset,
iconAsset: 'assets/images/red_cross2.png',
tooltip: 'Refuser',
onTap: onRefuse,
),
),
],
)
else if (card.responseMode == CarteResponseMode.ack)
_ActionPill(
asset: QuotidienTheme.pillTurquoiseAsset,
iconAsset: 'assets/images/coche.png',
tooltip: 'Bien reçu',
onTap: onAck,
),
],
],
),
),
);
}
}
/// Bouton pilule peinte (coche / croix intégrées) — carte congés.
class _PilulePeinteButton extends StatelessWidget {
final String asset;
final String tooltip;
final VoidCallback onTap;
const _PilulePeinteButton({
required this.asset,
required this.tooltip,
required this.onTap,
});
@override
Widget build(BuildContext context) {
return Tooltip(
message: tooltip,
child: InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(20),
child: Image.asset(
asset,
height: 36,
fit: BoxFit.contain,
filterQuality: FilterQuality.high,
),
),
);
}
}
/// Bouton pilule dessiné (fond pastel + coche / croix).
class _ActionPill extends StatelessWidget {
final String asset;
final String iconAsset;
final String tooltip;
final VoidCallback onTap;
const _ActionPill({
required this.asset,
required this.iconAsset,
required this.tooltip,
required this.onTap,
});
@override
Widget build(BuildContext context) {
return Tooltip(
message: tooltip,
child: InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(24),
child: SizedBox(
height: 40,
child: Stack(
alignment: Alignment.center,
children: [
Positioned.fill(
child: Image.asset(asset, fit: BoxFit.fill),
),
Image.asset(
iconAsset,
height: 22,
width: 22,
fit: BoxFit.contain,
),
],
),
),
),
);
}
}
@@ -3,6 +3,7 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
import 'package:p_tits_pas/widgets/quotidien/carte.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
/// Rôle qui consulte le bandeau : côté parent (enfant | nounou) ou côté AM
@@ -37,7 +38,7 @@ class CoupleSelectorBandeau extends StatelessWidget {
CoupleGarde? get _selected {
if (couples.isEmpty) return null;
if (selectedCoupleId != null) {
if (selectedCoupleId != null) {
for (final c in couples) {
if (c.id == selectedCoupleId) return c;
}
@@ -133,16 +134,51 @@ class _CoupleCard extends StatelessWidget {
required this.colorIndex,
});
/// Libellé parents côté AM : « Sophie » ou « Thomas et Claire ».
static String _parentsLabel(List<CoupleMembre> parents) {
if (parents.isEmpty) return 'Parents';
String prenomOf(CoupleMembre p) {
final prenom = (p.prenom ?? '').trim();
if (prenom.isNotEmpty) return prenom;
return p.displayName(fallback: 'Parent');
}
if (parents.length == 1) return prenomOf(parents.first);
return '${prenomOf(parents[0])} et ${prenomOf(parents[1])}';
}
@override
Widget build(BuildContext context) {
return Container(
height: 90,
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(QuotidienTheme.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length]),
fit: BoxFit.fill,
// Parent mode: enfant | AM (photo + prénom)
// AM mode: enfant | parent(s) — texte seul, pas de vignette parent
final isParentMode = mode == CoupleBandeauMode.parent;
Widget amOrParentsWidget;
if (isParentMode) {
amOrParentsWidget = _MembreTile(
photoUrl: couple.am?.photoUrl,
name: (couple.am?.prenom != null && couple.am!.prenom!.isNotEmpty)
? couple.am!.prenom!
: (couple.am?.displayName(fallback: 'Nounou') ?? 'Nounou'),
fallbackIcon: Icons.volunteer_activism,
);
} else {
amOrParentsWidget = Text(
_parentsLabel(couple.parents),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merienda(
fontSize: 22,
fontWeight: FontWeight.bold,
color: QuotidienTheme.ink,
),
),
);
}
return Carte.bandeau(
assetPath: QuotidienTheme
.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length],
height: 90,
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
children: [
@@ -151,7 +187,8 @@ class _CoupleCard extends StatelessWidget {
padding: const EdgeInsets.only(right: 12),
child: _MembreTile(
photoUrl: couple.enfant.photoUrl,
name: (couple.enfant.prenom != null && couple.enfant.prenom!.isNotEmpty)
name: (couple.enfant.prenom != null &&
couple.enfant.prenom!.isNotEmpty)
? couple.enfant.prenom!
: couple.enfant.displayName(fallback: 'Enfant'),
fallbackIcon: Icons.child_care,
@@ -171,29 +208,17 @@ class _CoupleCard extends StatelessWidget {
Expanded(
child: Padding(
padding: const EdgeInsets.only(left: 12),
child: _MembreTile(
photoUrl: couple.am.photoUrl,
name: (couple.am.prenom != null && couple.am.prenom!.isNotEmpty)
? couple.am.prenom!
: couple.am.displayName(
fallback: mode == CoupleBandeauMode.parent
? 'Nounou'
: 'Parent',
),
fallbackIcon: mode == CoupleBandeauMode.parent
? Icons.volunteer_activism
: Icons.person_outline,
),
child: amOrParentsWidget,
),
),
SizedBox(
width: 28,
child: showChevron
? const Icon(
Icons.keyboard_arrow_down,
color: QuotidienTheme.ink,
)
: null,
child: showChevron
? const Icon(
Icons.keyboard_arrow_down,
color: QuotidienTheme.ink,
)
: null,
),
],
),
@@ -279,24 +304,22 @@ class _CoupleBandeauSkeleton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
height: 90,
decoration: BoxDecoration(
image: DecorationImage(
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
fit: BoxFit.fill,
colorFilter: ColorFilter.mode(
Colors.white.withValues(alpha: 0.5),
BlendMode.lighten,
return ColorFiltered(
colorFilter: ColorFilter.mode(
Colors.white.withValues(alpha: 0.5),
BlendMode.lighten,
),
child: Carte.bandeau(
assetPath: QuotidienTheme.bandeauLime,
height: 90,
child: const Center(
child: SizedBox(
width: 26,
height: 26,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
),
alignment: Alignment.center,
child: const SizedBox(
width: 26,
height: 26,
child: CircularProgressIndicator(strokeWidth: 2),
),
);
}
}
@@ -306,14 +329,9 @@ class _CoupleBandeauEmpty extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
return Carte.bandeau(
assetPath: QuotidienTheme.bandeauLime,
height: 90,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(QuotidienTheme.bandeauLime), // Un asset existant par défaut
fit: BoxFit.fill,
),
),
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
children: [
@@ -342,38 +360,35 @@ class _CoupleBandeauError extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
height: 90,
decoration: BoxDecoration(
image: DecorationImage(
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
fit: BoxFit.fill,
colorFilter: ColorFilter.mode(
QuotidienTheme.coral.withValues(alpha: 0.3),
BlendMode.srcATop,
),
),
return ColorFiltered(
colorFilter: ColorFilter.mode(
QuotidienTheme.coral.withValues(alpha: 0.3),
BlendMode.srcATop,
),
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
children: [
const Icon(Icons.error_outline, color: QuotidienTheme.ink),
const SizedBox(width: 12),
Expanded(
child: Text(
message,
style: GoogleFonts.merriweather(
fontSize: 13,
color: QuotidienTheme.ink,
child: Carte.bandeau(
assetPath: QuotidienTheme.bandeauLime,
height: 90,
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
children: [
const Icon(Icons.error_outline, color: QuotidienTheme.ink),
const SizedBox(width: 12),
Expanded(
child: Text(
message,
style: GoogleFonts.merriweather(
fontSize: 13,
color: QuotidienTheme.ink,
),
),
),
),
if (onRetry != null)
TextButton(
onPressed: onRetry,
child: const Text('Réessayer'),
),
],
if (onRetry != null)
TextButton(
onPressed: onRetry,
child: const Text('Réessayer'),
),
],
),
),
);
}
@@ -183,15 +183,16 @@ class _UserMenu extends StatelessWidget {
title: Text('Profil'),
),
),
const PopupMenuItem(
value: 'search_am',
child: ListTile(
dense: true,
contentPadding: EdgeInsets.zero,
leading: Icon(Icons.search, size: 20),
title: Text('Recherche AM'),
if (onSearchAmTap != null)
const PopupMenuItem(
value: 'search_am',
child: ListTile(
dense: true,
contentPadding: EdgeInsets.zero,
leading: Icon(Icons.search, size: 20),
title: Text('Recherche AM'),
),
),
),
const PopupMenuItem(
value: 'settings',
child: ListTile(
@@ -6,6 +6,7 @@ abstract final class QuotidienTheme {
static const Color ink = Color(0xFF2F2F2F);
static const Color ivory = Color(0xFFFFFEF9);
static const Color turquoise = Color(0xFF8AD0C8);
static const Color peach = Color(0xFFFFCCB6);
static const Color lavender = Color(0xFFC6A3D8);
static const Color coral = Color(0xFFF4A28C);
static const Color softGreenPill = Color(0xFFB8D9A8);
@@ -48,6 +49,7 @@ abstract final class QuotidienTheme {
'assets/images/bg_turquoise_pill.png';
static const String pillLavenderAsset =
'assets/images/bg_lavender_pill.png';
static const String pillCorailAsset = 'assets/images/bg_corail_pill.png';
/// Trait crayon gris (2400×28, transparent) : séparateurs bandeau / corps /
/// footer. Version verticale (28×2400) entre les colonnes.
+72
View File
@@ -1,6 +1,22 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
sha256: "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4"
url: "https://pub.dev"
source: hosted
version: "4.3.0"
args:
dependency: transitive
description:
name: args
sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
url: "https://pub.dev"
source: hosted
version: "2.7.0"
async:
dependency: transitive
description:
@@ -25,6 +41,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.4.0"
checked_yaml:
dependency: transitive
description:
name: checked_yaml
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
url: "https://pub.dev"
source: hosted
version: "2.0.3"
cli_util:
dependency: transitive
description:
name: cli_util
sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
url: "https://pub.dev"
source: hosted
version: "0.4.2"
clock:
dependency: transitive
description:
@@ -150,6 +182,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_launcher_icons:
dependency: "direct dev"
description:
name: flutter_launcher_icons
sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
url: "https://pub.dev"
source: hosted
version: "0.13.1"
flutter_lints:
dependency: "direct dev"
description:
@@ -213,6 +253,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
image:
dependency: transitive
description:
name: image
sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89
url: "https://pub.dev"
source: hosted
version: "4.10.1"
image_picker:
dependency: "direct main"
description:
@@ -293,6 +341,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.6.7"
json_annotation:
dependency: transitive
description:
name: json_annotation
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
url: "https://pub.dev"
source: hosted
version: "4.9.0"
leak_tracker:
dependency: transitive
description:
@@ -461,6 +517,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.8"
posix:
dependency: transitive
description:
name: posix
sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
url: "https://pub.dev"
source: hosted
version: "6.5.2"
provider:
dependency: "direct main"
description:
@@ -722,6 +786,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
yaml:
dependency: transitive
description:
name: yaml
sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
url: "https://pub.dev"
source: hosted
version: "3.1.4"
sdks:
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.19.0"
+18 -2
View File
@@ -30,13 +30,29 @@ dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^2.0.0
flutter_launcher_icons: ^0.13.1
flutter_launcher_icons:
android: "launcher_icon"
ios: false
image_path: "assets/images/icon.png"
web:
generate: true
image_path: "assets/images/icon.png"
background_color: "#ffffff"
theme_color: "#ffffff"
windows:
generate: true
image_path: "assets/images/icon.png"
icon_size: 256
flutter:
uses-material-design: true
assets:
- assets/images/ # Déclarer le dossier entier
- assets/cards/ # Nouveau dossier de cartes
- assets/images/
- assets/images/cartes/
- assets/cards/
- assets/documents/
fonts:
Binary file not shown.

Before

Width:  |  Height:  |  Size: 917 B

After

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 165 KiB

+5 -5
View File
@@ -3,19 +3,19 @@
"short_name": "P'titsPas",
"start_url": ".",
"display": "standalone",
"background_color": "#FFFEF9",
"theme_color": "#8AD0C8",
"background_color": "#ffffff",
"theme_color": "#ffffff",
"description": "P'titsPas - Grandir pas à pas, sereinement",
"orientation": "portrait-primary",
"prefer_related_applications": false,
"icons": [
{
"src": "assets/images/icon.png",
"src": "icons/Icon-192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "assets/images/icon.png",
"src": "icons/Icon-512.png",
"sizes": "512x512",
"type": "image/png"
},
@@ -32,4 +32,4 @@
"purpose": "maskable"
}
]
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 47 KiB

+1
View File
File diff suppressed because one or more lines are too long