fix(absence) : déduire les jours pris du report CP au changement de période

Au passage d'une période de référence, le report de l'"en cours d'acquisition" (N) vers l'"acquis" (N-1) ne déduisait pas les jours déjà pris : un salarié récupérait les CP qu'il avait consommés. Le report ne porte désormais que les jours non pris. Les congés sont imputés au plus ancien bucket d'abord (l'acquis N-2, qui expire de toute façon au changement de période), donc seuls les jours pris au-delà réduisent le report. Ajoute AccrueLeaveCommandTest couvrant le report avec jour pris, l'imputation oldest-first et le report intégral sans jour pris.
chore: bump version to v0.4.35
2026-06-24 10:52:05 +02:00 · 2026-06-24 08:13:40 +00:00 · 2026-06-24 08:13:32 +00:00 · 2026-06-24 08:10:10 +00:00 · 2026-06-24 10:06:25 +02:00 · 2026-06-24 09:34:58 +02:00
10 changed files with 728 additions and 138 deletions
@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.4.34'
+    app.version: '0.4.35'
@@ -0,0 +1,61 @@
+<template>
+    <Teleport v-if="modelValue" to="body">
+        <Transition name="modal" appear>
+            <div class="fixed inset-0 z-[70] flex items-center justify-center">
+                <div class="absolute inset-0 bg-black/30" @click.stop="cancel" />
+                <div class="relative z-10 w-full max-w-md rounded-lg bg-white p-6 shadow-xl">
+                    <h3 class="text-lg font-bold text-neutral-900">{{ $t('directory.reports.confirmDeleteTitle') }}</h3>
+                    <p class="mt-3 text-sm text-neutral-600">
+                        {{ $t('directory.reports.confirmDeleteMessage') }}
+                    </p>
+                    <div class="mt-6 flex justify-end gap-3">
+                        <MalioButton
+                            variant="tertiary"
+                            :label="$t('common.cancel')"
+                            button-class="w-auto px-4"
+                            :disabled="busy"
+                            @click="cancel"
+                        />
+                        <MalioButton
+                            variant="danger"
+                            :label="$t('common.delete')"
+                            button-class="w-auto px-4"
+                            :disabled="busy"
+                            @click="$emit('confirm')"
+                        />
+                    </div>
+                </div>
+            </div>
+        </Transition>
+    </Teleport>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+    modelValue: boolean
+    // Suppression en cours : on désactive les actions pour éviter un double envoi.
+    busy?: boolean
+}>()
+
+const emit = defineEmits<{
+    (e: 'update:modelValue', value: boolean): void
+    (e: 'confirm'): void
+}>()
+
+function cancel() {
+    if (props.busy) return
+    emit('update:modelValue', false)
+}
+</script>
+
+<style scoped>
+.modal-enter-active,
+.modal-leave-active {
+    transition: opacity 0.2s ease;
+}
+
+.modal-enter-from,
+.modal-leave-to {
+    opacity: 0;
+}
+</style>
@@ -938,12 +938,24 @@
  "directory": {
    "title": "Répertoire",
    "tabs": {
+      "info": "Informations",
      "clients": "Clients",
      "prospects": "Prospects",
      "contact": "Contact",
      "address": "Adresse",
      "report": "Rapport"
    },
+    "info": {
+      "fields": {
+        "name": "Nom",
+        "email": "Email",
+        "phone": "Téléphone"
+      }
+    },
+    "validation": {
+      "nameRequired": "Le nom est requis.",
+      "subjectRequired": "L'objet est requis."
+    },
    "clients": {
      "add": "Ajouter un client",
      "empty": "Aucun client trouvé."
@@ -982,9 +994,16 @@
    },
    "reports": {
      "add": "Ajouter un compte-rendu",
-      "empty": "Aucun compte-rendu.",
+      "addTitle": "Nouveau compte-rendu",
+      "editTitle": "Modifier le compte-rendu",
+      "empty": "Aucun compte-rendu",
+      "emptyHint": "Consignez vos échanges (appels, rendez-vous, emails) pour garder l'historique de la relation.",
+      "count": "{n} compte-rendu | {n} comptes-rendus",
+      "documentsLabel": "Documents",
      "saved": "Compte-rendu enregistré.",
      "deleted": "Compte-rendu supprimé.",
+      "confirmDeleteTitle": "Supprimer ce compte-rendu ?",
+      "confirmDeleteMessage": "Cette action est irréversible. Les documents joints seront également supprimés.",
      "fields": {
        "subject": "Objet",
        "type": "Type d'échange",
@@ -0,0 +1,144 @@
+<template>
+    <MalioDrawer v-model="isOpen">
+        <template #header>
+            <h2 class="text-xl font-bold">
+                {{ isEditing ? $t('directory.reports.editTitle') : $t('directory.reports.addTitle') }}
+            </h2>
+        </template>
+        <form @submit.prevent="handleSubmit" class="flex flex-col gap-4">
+            <MalioInputText
+                v-model="form.subject"
+                :label="$t('directory.reports.fields.subject')"
+                input-class="w-full"
+                :error="touched.subject && !form.subject.trim() ? $t('directory.validation.subjectRequired') : ''"
+                @blur="touched.subject = true"
+            />
+            <MalioSelect
+                v-model="form.type"
+                :label="$t('directory.reports.fields.type')"
+                :options="typeOptions"
+                group-class="w-full"
+            />
+            <MalioDate
+                v-model="form.occurredAt"
+                :label="$t('directory.reports.fields.occurredAt')"
+            />
+            <MalioInputRichText
+                v-model="form.body"
+                :label="$t('directory.reports.fields.body')"
+                min-height="180px"
+            />
+
+            <div class="mt-4 flex justify-end gap-3">
+                <MalioButton
+                    variant="tertiary"
+                    button-class="w-auto px-4"
+                    :label="$t('common.cancel')"
+                    @click="isOpen = false"
+                />
+                <MalioButton
+                    button-class="w-auto px-6"
+                    :label="$t('common.save')"
+                    :disabled="isSubmitting"
+                    @click="handleSubmit"
+                />
+            </div>
+        </form>
+    </MalioDrawer>
+</template>
+
+<script setup lang="ts">
+import type { CommercialReport, CommercialReportWrite, ReportType } from '~/modules/directory/services/dto/commercial-report'
+import { useCommercialReportService } from '~/modules/directory/services/commercial-reports'
+
+const props = defineProps<{
+    modelValue: boolean
+    report: CommercialReport | null
+    owner: { client?: string, prospect?: string }
+}>()
+
+const emit = defineEmits<{
+    (e: 'update:modelValue', value: boolean): void
+    (e: 'saved'): void
+}>()
+
+const { t } = useI18n()
+const { create, update } = useCommercialReportService()
+
+const isOpen = computed({
+    get: () => props.modelValue,
+    set: (v) => emit('update:modelValue', v),
+})
+
+const isEditing = computed(() => !!props.report)
+const isSubmitting = ref(false)
+
+const typeOptions: { label: string, value: ReportType }[] = [
+    { label: t('directory.reports.types.call'), value: 'call' },
+    { label: t('directory.reports.types.meeting'), value: 'meeting' },
+    { label: t('directory.reports.types.email'), value: 'email' },
+    { label: t('directory.reports.types.note'), value: 'note' },
+]
+
+function today(): string {
+    return new Date().toISOString().slice(0, 10)
+}
+
+// L'éditeur riche émet du HTML : un contenu « vide » vaut `<p></p>`. On le
+// normalise en null pour ne pas persister une coquille vide.
+function normalizeBody(html: string): string | null {
+    const stripped = html.replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').trim()
+    return stripped ? html : null
+}
+
+const form = reactive<{ subject: string, type: ReportType, occurredAt: string, body: string }>({
+    subject: '',
+    type: 'note',
+    occurredAt: today(),
+    body: '',
+})
+const touched = reactive({ subject: false })
+
+watch(() => props.modelValue, (open) => {
+    if (!open) return
+    if (props.report) {
+        form.subject = props.report.subject
+        form.type = props.report.type
+        form.occurredAt = props.report.occurredAt.slice(0, 10)
+        form.body = props.report.body ?? ''
+    } else {
+        form.subject = ''
+        form.type = 'note'
+        form.occurredAt = today()
+        form.body = ''
+    }
+    touched.subject = false
+})
+
+async function handleSubmit(): Promise<void> {
+    touched.subject = true
+    if (!form.subject.trim() || isSubmitting.value) return
+
+    isSubmitting.value = true
+    try {
+        const payload: CommercialReportWrite = {
+            subject: form.subject.trim(),
+            type: form.type,
+            occurredAt: form.occurredAt,
+            body: normalizeBody(form.body),
+            ...props.owner,
+        }
+
+        if (isEditing.value && props.report) {
+            await update(props.report.id, payload)
+        } else {
+            await create(payload)
+        }
+
+        emit('saved')
+        isOpen.value = false
+    } finally {
+        isSubmitting.value = false
+    }
+}
+</script>
@@ -1,158 +1,235 @@
 <template>
-    <div class="flex flex-col gap-6 pt-6">
-        <!-- Formulaire d'ajout / édition -->
-        <div v-if="isAdmin" class="grid grid-cols-2 gap-x-[44px] gap-y-4 rounded-lg bg-white px-7 py-5 shadow-[0_4px_4px_0_rgba(0,0,0,0.10)]">
-            <MalioInputText
-                class="col-span-2"
-                :label="$t('directory.reports.fields.subject')"
-                v-model="draft.subject"
+    <div class="flex flex-col gap-5 pt-6">
+        <!-- Barre d'action -->
+        <div class="flex items-center justify-between gap-3">
+            <p class="text-sm text-neutral-500">
+                <span v-if="reports.length">{{ $t('directory.reports.count', { n: reports.length }, reports.length) }}</span>
+            </p>
+            <MalioButton
+                v-if="canManage"
+                icon-name="mdi:plus"
+                icon-position="left"
+                button-class="w-auto px-4"
+                :label="$t('directory.reports.add')"
+                @click="openCreate"
            />
-            <MalioSelect
-                :label="$t('directory.reports.fields.type')"
-                v-model="draft.type"
-                :options="typeOptions"
-                group-class="w-full"
-            />
-            <MalioDate
-                :label="$t('directory.reports.fields.occurredAt')"
-                v-model="draft.occurredAt"
-            />
-            <MalioInputTextArea
-                class="col-span-2"
-                :label="$t('directory.reports.fields.body')"
-                v-model="draft.body"
-            />
-            <div class="col-span-2 flex justify-end gap-3">
-                <MalioButton
-                    v-if="editingId"
-                    variant="secondary"
-                    button-class="w-auto px-4"
-                    :label="$t('common.cancel')"
-                    @click="resetDraft"
-                />
-                <MalioButton
-                    button-class="w-auto px-4"
-                    :label="editingId ? $t('common.save') : $t('directory.reports.add')"
-                    :disabled="!draft.subject"
-                    @click="save"
-                />
-            </div>
        </div>

-        <!-- Liste des comptes-rendus -->
-        <div v-for="report in reports" :key="report.id" class="rounded border border-neutral-200 p-4">
-            <div class="flex items-start justify-between">
-                <div>
-                    <p class="font-semibold text-neutral-800">{{ report.subject }}</p>
-                    <p class="text-xs text-neutral-500">
-                        {{ formatDate(report.occurredAt) }} · {{ $t(`directory.reports.types.${report.type}`) }}
-                        <span v-if="report.author"> · {{ report.author.username }}</span>
-                    </p>
-                </div>
-                <div v-if="isAdmin" class="flex gap-2">
-                    <MalioButtonIcon icon="mdi:pencil-outline" variant="ghost" :aria-label="$t('common.edit')" @click="edit(report)" />
-                    <MalioButtonIcon icon="mdi:delete-outline" variant="ghost" :aria-label="$t('common.delete')" @click="remove(report.id)" />
-                </div>
-            </div>
-            <p v-if="report.body" class="mt-2 whitespace-pre-wrap text-sm text-neutral-700">{{ report.body }}</p>
-
-            <div class="mt-3 flex flex-col gap-2">
-                <ReportDocumentList
-                    :documents="report.documents ?? []"
-                    :is-admin="isAdmin"
-                    @delete="(id) => removeDocument(report, id)"
-                />
-                <ReportDocumentUpload
-                    v-if="isAdmin"
-                    :report-id="report.id"
-                    @uploaded="reload"
-                />
-            </div>
+        <!-- État vide -->
+        <div
+            v-if="!loading && !reports.length"
+            class="flex flex-col items-center gap-2 rounded-lg border border-dashed border-neutral-200 bg-neutral-50 px-6 py-12 text-center"
+        >
+            <Icon name="mdi:message-text-outline" class="text-4xl text-neutral-300" />
+            <p class="font-medium text-neutral-600">{{ $t('directory.reports.empty') }}</p>
+            <p class="max-w-sm text-sm text-neutral-400">{{ $t('directory.reports.emptyHint') }}</p>
+            <MalioButton
+                v-if="canManage"
+                variant="tertiary"
+                icon-name="mdi:plus"
+                icon-position="left"
+                button-class="mt-2 w-auto px-4"
+                :label="$t('directory.reports.add')"
+                @click="openCreate"
+            />
        </div>

-        <p v-if="!reports.length" class="text-sm text-neutral-400">
-            {{ $t('directory.reports.empty') }}
-        </p>
+        <!-- Timeline antéchronologique -->
+        <ol v-else class="flex flex-col">
+            <li
+                v-for="report in sortedReports"
+                :key="report.id"
+                class="relative flex gap-4 pb-6 last:pb-0"
+            >
+                <!-- Rail + pastille de type -->
+                <div class="flex flex-col items-center">
+                    <span
+                        class="flex h-9 w-9 shrink-0 items-center justify-center rounded-full"
+                        :class="typeStyle(report.type).badge"
+                    >
+                        <Icon :name="typeStyle(report.type).icon" class="text-lg" />
+                    </span>
+                    <span class="mt-1 w-px grow bg-neutral-200" aria-hidden="true" />
+                </div>
+
+                <!-- Carte -->
+                <div class="flex-1 rounded-lg border border-neutral-200 bg-white p-4 shadow-[0_1px_2px_0_rgba(0,0,0,0.05)]">
+                    <div class="flex items-start justify-between gap-3">
+                        <div class="min-w-0">
+                            <div class="flex flex-wrap items-center gap-2">
+                                <span
+                                    class="rounded-full px-2 py-0.5 text-xs font-medium"
+                                    :class="typeStyle(report.type).chip"
+                                >
+                                    {{ $t(`directory.reports.types.${report.type}`) }}
+                                </span>
+                                <p class="truncate font-semibold text-neutral-800">{{ report.subject }}</p>
+                            </div>
+                            <p class="mt-1 text-xs text-neutral-500">
+                                <span :title="absoluteDate(report.occurredAt)">{{ relativeDate(report.occurredAt) }}</span>
+                                <span v-if="report.author"> · {{ report.author.username }}</span>
+                            </p>
+                        </div>
+                        <div v-if="canManage" class="flex shrink-0 gap-1">
+                            <MalioButtonIcon
+                                icon="mdi:pencil-outline"
+                                variant="ghost"
+                                :aria-label="$t('common.edit')"
+                                @click="openEdit(report)"
+                            />
+                            <MalioButtonIcon
+                                icon="mdi:delete-outline"
+                                variant="ghost"
+                                :aria-label="$t('common.delete')"
+                                @click="askDelete(report)"
+                            />
+                        </div>
+                    </div>
+
+                    <MalioInputRichText
+                        v-if="report.body"
+                        :model-value="report.body"
+                        :editable="false"
+                        :reserve-message-space="false"
+                        editor-class="!border-0 !rounded-none !bg-transparent !p-0 text-sm text-neutral-700"
+                        class="mt-2"
+                    />
+
+                    <!-- Documents joints -->
+                    <div
+                        v-if="(report.documents?.length ?? 0) || canManage"
+                        class="mt-3 border-t border-neutral-100 pt-3"
+                    >
+                        <p class="mb-2 text-xs font-medium uppercase tracking-wide text-neutral-400">
+                            {{ $t('directory.reports.documentsLabel') }}
+                        </p>
+                        <div class="flex flex-col gap-2">
+                            <ReportDocumentList
+                                v-if="report.documents?.length"
+                                :documents="report.documents"
+                                :can-manage="canManage"
+                                @delete="(docId) => removeDocument(docId)"
+                            />
+                            <ReportDocumentUpload
+                                v-if="canManage"
+                                :report-id="report.id"
+                                @uploaded="reload"
+                            />
+                        </div>
+                    </div>
+                </div>
+            </li>
+        </ol>
+
+        <CommercialReportDrawer
+            v-model="drawerOpen"
+            :report="editing"
+            :owner="owner"
+            @saved="reload"
+        />
+        <ConfirmDeleteReportModal
+            v-model="confirmOpen"
+            :busy="deleting"
+            @confirm="confirmDelete"
+        />
    </div>
 </template>

 <script setup lang="ts">
-import type { CommercialReport, CommercialReportWrite, ReportType } from '~/modules/directory/services/dto/commercial-report'
+import type { CommercialReport, ReportType } from '~/modules/directory/services/dto/commercial-report'
 import { useCommercialReportService } from '~/modules/directory/services/commercial-reports'
 import { useReportDocumentService } from '~/modules/directory/services/report-documents'

 const props = defineProps<{
    owner: { client?: string, prospect?: string }
-    isAdmin: boolean
+    canManage: boolean
 }>()

-const { t } = useI18n()
 const reportService = useCommercialReportService()
 const documentService = useReportDocumentService()

 const reports = ref<CommercialReport[]>([])
-const editingId = ref<number | null>(null)
+const loading = ref(true)

-function emptyDraft(): CommercialReportWrite {
-    return {
-        subject: '',
-        body: null,
-        occurredAt: new Date().toISOString().slice(0, 10),
-        type: 'note',
-        ...props.owner,
+const drawerOpen = ref(false)
+const editing = ref<CommercialReport | null>(null)
+
+const confirmOpen = ref(false)
+const pendingDelete = ref<CommercialReport | null>(null)
+const deleting = ref(false)
+
+// Le plus récent en haut (l'API ne garantit pas l'ordre).
+const sortedReports = computed(() =>
+    [...reports.value].sort((a, b) => b.occurredAt.localeCompare(a.occurredAt)),
+)
+
+const typeStyles: Record<ReportType, { icon: string, badge: string, chip: string }> = {
+    call: { icon: 'mdi:phone-outline', badge: 'bg-emerald-100 text-emerald-700', chip: 'bg-emerald-50 text-emerald-700' },
+    meeting: { icon: 'mdi:account-group-outline', badge: 'bg-violet-100 text-violet-700', chip: 'bg-violet-50 text-violet-700' },
+    email: { icon: 'mdi:email-outline', badge: 'bg-sky-100 text-sky-700', chip: 'bg-sky-50 text-sky-700' },
+    note: { icon: 'mdi:note-text-outline', badge: 'bg-amber-100 text-amber-700', chip: 'bg-amber-50 text-amber-700' },
+}
+function typeStyle(type: ReportType) {
+    return typeStyles[type]
+}
+
+function startOfDay(d: Date): number {
+    return new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime()
+}
+
+function absoluteDate(iso: string): string {
+    return new Date(iso).toLocaleDateString('fr-FR')
+}
+
+// Date relative lisible (« aujourd'hui », « il y a 3 jours »…) avec repli sur la
+// date absolue au-delà d'un an. La date exacte reste disponible en infobulle.
+function relativeDate(iso: string): string {
+    const diffDays = Math.round((startOfDay(new Date(iso)) - startOfDay(new Date())) / 86400000)
+    const rtf = new Intl.RelativeTimeFormat('fr-FR', { numeric: 'auto' })
+    const abs = Math.abs(diffDays)
+    if (abs < 1) return rtf.format(0, 'day')
+    if (abs < 7) return rtf.format(diffDays, 'day')
+    if (abs < 31) return rtf.format(Math.round(diffDays / 7), 'week')
+    if (abs < 365) return rtf.format(Math.round(diffDays / 30), 'month')
+    return absoluteDate(iso)
+}
+
+function openCreate(): void {
+    editing.value = null
+    drawerOpen.value = true
+}
+
+function openEdit(report: CommercialReport): void {
+    editing.value = report
+    drawerOpen.value = true
+}
+
+function askDelete(report: CommercialReport): void {
+    pendingDelete.value = report
+    confirmOpen.value = true
+}
+
+async function confirmDelete(): Promise<void> {
+    if (!pendingDelete.value || deleting.value) return
+    deleting.value = true
+    try {
+        await reportService.remove(pendingDelete.value.id)
+        confirmOpen.value = false
+        pendingDelete.value = null
+        await reload()
+    } finally {
+        deleting.value = false
    }
 }
-const draft = ref<CommercialReportWrite>(emptyDraft())

-const typeOptions: { label: string, value: ReportType }[] = [
-    { label: t('directory.reports.types.call'), value: 'call' },
-    { label: t('directory.reports.types.meeting'), value: 'meeting' },
-    { label: t('directory.reports.types.email'), value: 'email' },
-    { label: t('directory.reports.types.note'), value: 'note' },
-]
-
-function formatDate(iso: string): string {
-    return new Date(iso).toLocaleDateString('fr-FR')
+async function removeDocument(id: number): Promise<void> {
+    await documentService.remove(id)
+    await reload()
 }

 async function reload(): Promise<void> {
    reports.value = await reportService.getByOwner(props.owner)
-}
-
-function resetDraft(): void {
-    editingId.value = null
-    draft.value = emptyDraft()
-}
-
-function edit(report: CommercialReport): void {
-    editingId.value = report.id
-    draft.value = {
-        subject: report.subject,
-        body: report.body,
-        occurredAt: report.occurredAt.slice(0, 10),
-        type: report.type,
-        ...props.owner,
-    }
-}
-
-async function save(): Promise<void> {
-    if (editingId.value) {
-        await reportService.update(editingId.value, draft.value)
-    } else {
-        await reportService.create(draft.value)
-    }
-    resetDraft()
-    await reload()
-}
-
-async function remove(id: number): Promise<void> {
-    await reportService.remove(id)
-    await reload()
-}
-
-async function removeDocument(report: CommercialReport, id: number): Promise<void> {
-    await documentService.remove(id)
-    await reload()
+    loading.value = false
 }

 onMounted(reload)
@@ -15,7 +15,7 @@
                {{ doc.originalName }}
            </a>
            <MalioButtonIcon
-                v-if="isAdmin"
+                v-if="canManage"
                icon="mdi:trash-can-outline"
                button-class="!text-red-600"
                :aria-label="$t('common.delete')"
@@ -32,7 +32,7 @@
 import type { ReportDocument } from '~/modules/directory/services/dto/report-document'
 import { useReportDocumentService } from '~/modules/directory/services/report-documents'

-defineProps<{ documents: ReportDocument[], isAdmin: boolean }>()
+defineProps<{ documents: ReportDocument[], canManage: boolean }>()
 defineEmits<{ delete: [id: number] }>()

 const { getDownloadUrl } = useReportDocumentService()
@@ -8,6 +8,36 @@
        <p v-if="loading">{{ $t('common.loading') }}</p>
        <template v-else-if="client">
            <MalioTabList v-model="activeTab" :tabs="tabs">
+                <template #info>
+                    <div class="flex flex-col gap-4 pt-6">
+                        <div class="relative grid grid-cols-2 gap-x-[44px] gap-y-4 rounded-lg bg-white px-7 py-5 shadow-[0_4px_4px_0_rgba(0,0,0,0.10)]">
+                            <MalioInputText
+                                v-model="info.name"
+                                class="col-span-2"
+                                :label="$t('directory.info.fields.name')"
+                                :error="infoTouched.name && !info.name.trim() ? $t('directory.validation.nameRequired') : ''"
+                                @blur="infoTouched.name = true"
+                            />
+                            <MalioInputText
+                                v-model="info.email"
+                                :label="$t('directory.info.fields.email')"
+                            />
+                            <MalioInputText
+                                v-model="info.phone"
+                                :label="$t('directory.info.fields.phone')"
+                            />
+                        </div>
+                        <div class="flex justify-center pt-2">
+                            <MalioButton
+                                button-class="w-auto px-6"
+                                :label="$t('common.save')"
+                                :disabled="savingInfo"
+                                @click="saveInfo"
+                            />
+                        </div>
+                    </div>
+                </template>
+
                <template #contact>
                    <div class="flex flex-col gap-4 pt-6">
                        <DirectoryContactBlock
@@ -69,7 +99,7 @@
                </template>

                <template #report>
-                    <CommercialReportTab :owner="owner" :is-admin="true" />
+                    <CommercialReportTab :owner="owner" :can-manage="canManage" />
                </template>
            </MalioTabList>
        </template>
@@ -107,22 +137,50 @@ const {
    load,
 } = useDirectoryDetail(owner)

+const { can } = usePermissions()
+const canManage = computed(() => can('directory.clients.manage'))
+
 const client = ref<Client | null>(null)
 const loading = ref(true)

-const activeTab = ref('contact')
+const activeTab = ref('info')
 const tabs = [
+    { key: 'info', label: t('directory.tabs.info'), icon: 'mdi:information-outline' },
    { key: 'contact', label: t('directory.tabs.contact'), icon: 'mdi:account-outline' },
    { key: 'address', label: t('directory.tabs.address'), icon: 'mdi:map-marker-outline' },
    { key: 'report', label: t('directory.tabs.report'), icon: 'mdi:file-document-outline' },
 ]

+// Champs de base de la fiche, édités en mémoire et persistés au clic sur
+// « Enregistrer » (PATCH), comme les onglets Contact/Adresse.
+const info = reactive({ name: '', email: '', phone: '' })
+const infoTouched = reactive({ name: false })
+const savingInfo = ref(false)
+
+async function saveInfo(): Promise<void> {
+    infoTouched.name = true
+    if (!info.name.trim() || savingInfo.value) return
+    savingInfo.value = true
+    try {
+        client.value = await clientService.update(id, {
+            name: info.name.trim(),
+            email: info.email.trim() || null,
+            phone: info.phone.trim() || null,
+        })
+    } finally {
+        savingInfo.value = false
+    }
+}
+
 function goBack(): void {
    router.push('/directory')
 }

 onMounted(async () => {
    client.value = await clientService.getById(id)
+    info.name = client.value.name ?? ''
+    info.email = client.value.email ?? ''
+    info.phone = client.value.phone ?? ''
    await load()
    loading.value = false
 })
@@ -8,6 +8,56 @@
        <p v-if="loading">{{ $t('common.loading') }}</p>
        <template v-else-if="prospect">
            <MalioTabList v-model="activeTab" :tabs="tabs">
+                <template #info>
+                    <div class="flex flex-col gap-4 pt-6">
+                        <div class="relative grid grid-cols-2 gap-x-[44px] gap-y-4 rounded-lg bg-white px-7 py-5 shadow-[0_4px_4px_0_rgba(0,0,0,0.10)]">
+                            <MalioInputText
+                                v-model="info.name"
+                                class="col-span-2"
+                                :label="$t('prospects.fields.name')"
+                                :error="infoTouched.name && !info.name.trim() ? $t('prospects.validation.nameRequired') : ''"
+                                @blur="infoTouched.name = true"
+                            />
+                            <MalioInputText
+                                v-model="info.company"
+                                :label="$t('prospects.fields.company')"
+                            />
+                            <MalioSelect
+                                v-model="info.status"
+                                :label="$t('prospects.fields.status')"
+                                :options="statusOptions"
+                                group-class="w-full"
+                            />
+                            <MalioInputText
+                                v-model="info.email"
+                                :label="$t('prospects.fields.email')"
+                            />
+                            <MalioInputText
+                                v-model="info.phone"
+                                :label="$t('prospects.fields.phone')"
+                            />
+                            <MalioInputText
+                                v-model="info.source"
+                                class="col-span-2"
+                                :label="$t('prospects.fields.source')"
+                            />
+                            <MalioInputTextArea
+                                v-model="info.notes"
+                                class="col-span-2"
+                                :label="$t('prospects.fields.notes')"
+                            />
+                        </div>
+                        <div class="flex justify-center pt-2">
+                            <MalioButton
+                                button-class="w-auto px-6"
+                                :label="$t('common.save')"
+                                :disabled="savingInfo"
+                                @click="saveInfo"
+                            />
+                        </div>
+                    </div>
+                </template>
+
                <template #contact>
                    <div class="flex flex-col gap-4 pt-6">
                        <DirectoryContactBlock
@@ -69,7 +119,7 @@
                </template>

                <template #report>
-                    <CommercialReportTab :owner="owner" :is-admin="true" />
+                    <CommercialReportTab :owner="owner" :can-manage="canManage" />
                </template>
            </MalioTabList>
        </template>
@@ -77,7 +127,7 @@
 </template>

 <script setup lang="ts">
-import type { Prospect } from '~/modules/directory/services/dto/prospect'
+import type { Prospect, ProspectStatus } from '~/modules/directory/services/dto/prospect'
 import { useProspectService } from '~/modules/directory/services/prospects'

 definePageMeta({ middleware: ['admin'] })
@@ -107,22 +157,74 @@ const {
    load,
 } = useDirectoryDetail(owner)

+const { can } = usePermissions()
+const canManage = computed(() => can('directory.prospects.manage'))
+
 const prospect = ref<Prospect | null>(null)
 const loading = ref(true)

-const activeTab = ref('contact')
+const activeTab = ref('info')
 const tabs = [
+    { key: 'info', label: t('directory.tabs.info'), icon: 'mdi:information-outline' },
    { key: 'contact', label: t('directory.tabs.contact'), icon: 'mdi:account-outline' },
    { key: 'address', label: t('directory.tabs.address'), icon: 'mdi:map-marker-outline' },
    { key: 'report', label: t('directory.tabs.report'), icon: 'mdi:file-document-outline' },
 ]

+const statusOptions = [
+    { label: t('prospects.status.new'), value: 'new' },
+    { label: t('prospects.status.contacted'), value: 'contacted' },
+    { label: t('prospects.status.qualified'), value: 'qualified' },
+    { label: t('prospects.status.won'), value: 'won' },
+    { label: t('prospects.status.lost'), value: 'lost' },
+]
+
+// Champs de base de la fiche, édités en mémoire et persistés au clic sur
+// « Enregistrer » (PATCH), comme les onglets Contact/Adresse.
+const info = reactive<{
+    name: string
+    company: string
+    email: string
+    phone: string
+    status: ProspectStatus
+    source: string
+    notes: string
+}>({ name: '', company: '', email: '', phone: '', status: 'new', source: '', notes: '' })
+const infoTouched = reactive({ name: false })
+const savingInfo = ref(false)
+
+async function saveInfo(): Promise<void> {
+    infoTouched.name = true
+    if (!info.name.trim() || savingInfo.value) return
+    savingInfo.value = true
+    try {
+        prospect.value = await prospectService.update(id, {
+            name: info.name.trim(),
+            company: info.company.trim() || null,
+            email: info.email.trim() || null,
+            phone: info.phone.trim() || null,
+            status: info.status,
+            source: info.source.trim() || null,
+            notes: info.notes.trim() || null,
+        })
+    } finally {
+        savingInfo.value = false
+    }
+}
+
 function goBack(): void {
    router.push('/directory')
 }

 onMounted(async () => {
    prospect.value = await prospectService.getById(id)
+    info.name = prospect.value.name ?? ''
+    info.company = prospect.value.company ?? ''
+    info.email = prospect.value.email ?? ''
+    info.phone = prospect.value.phone ?? ''
+    info.status = prospect.value.status ?? 'new'
+    info.source = prospect.value.source ?? ''
+    info.notes = prospect.value.notes ?? ''
    await load()
    loading.value = false
 })
@@ -111,9 +111,18 @@ class AccrueLeaveCommand extends Command
                $previousBalance = null !== $previousPeriod
                    ? $this->balanceRepository->findOneForPeriod($user, AbsenceType::PaidLeave, $previousPeriod)
                    : null;
-                $balance->setAcquired(
-                    null !== $previousBalance ? $previousBalance->getAcquiring() : $profile->getInitialLeaveBalance(),
-                );
+
+                if (null !== $previousBalance) {
+                    // Only the days *not yet taken* carry over. Leave is charged
+                    // oldest-first: it first consumes the previous "acquired"
+                    // (N-2) bucket — which expires at roll-over anyway — so only
+                    // days taken beyond that bucket eat into the carry-over.
+                    $carryOver = $previousBalance->getAcquiring()
+                        - max(0.0, $previousBalance->getTaken() - $previousBalance->getAcquired());
+                    $balance->setAcquired(max(0.0, $carryOver));
+                } else {
+                    $balance->setAcquired($profile->getInitialLeaveBalance());
+                }
            }

            if ($monthKey === $balance->getLastAccruedMonth()) {
@@ -0,0 +1,120 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Functional\Command;
+
+use App\Module\Absence\Domain\Entity\AbsenceBalance;
+use App\Module\Absence\Domain\Enum\AbsenceType;
+use App\Module\Absence\Infrastructure\Command\AccrueLeaveCommand;
+use App\Module\Absence\Infrastructure\Doctrine\DoctrineAbsenceBalanceRepository;
+use App\Module\Core\Domain\Entity\User;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * Covers the period roll-over: when a new reference period opens, the previous
+ * period's "en cours d'acquisition" (N) becomes the new "acquired" (N-1), but
+ * only for the days that were not already taken.
+ *
+ * @internal
+ */
+class AccrueLeaveCommandTest extends KernelTestCase
+{
+    private EntityManagerInterface $em;
+    private DoctrineAbsenceBalanceRepository $balances;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->em       = self::getContainer()->get(EntityManagerInterface::class);
+        $this->balances = self::getContainer()->get(DoctrineAbsenceBalanceRepository::class);
+    }
+
+    /**
+     * Tristan's real case: 9.75 accruing, 1 day taken, nothing previously
+     * acquired → the day taken eats into the carry-over, so 8.75 rolls over
+     * (not 9.75).
+     */
+    public function testCarryOverDeductsTakenDays(): void
+    {
+        $user = $this->createEmployee();
+        $this->seedPreviousBalance($user, acquired: 0.0, acquiring: 9.75, taken: 1.0);
+
+        $this->runForJune2026();
+
+        $rolled = $this->balances->findOneForPeriod($user, AbsenceType::PaidLeave, '2026-2027');
+        self::assertNotNull($rolled);
+        self::assertEqualsWithDelta(8.75, $rolled->getAcquired(), 0.0001);
+    }
+
+    /**
+     * Leave is charged oldest-first: the 3 days taken come out of the expiring
+     * N-2 "acquired" bucket (5), so the full 10 accruing days carry over intact.
+     */
+    public function testCarryOverChargesOldestBucketFirst(): void
+    {
+        $user = $this->createEmployee();
+        $this->seedPreviousBalance($user, acquired: 5.0, acquiring: 10.0, taken: 3.0);
+
+        $this->runForJune2026();
+
+        $rolled = $this->balances->findOneForPeriod($user, AbsenceType::PaidLeave, '2026-2027');
+        self::assertNotNull($rolled);
+        self::assertEqualsWithDelta(10.0, $rolled->getAcquired(), 0.0001);
+    }
+
+    /** No day taken → the whole accruing bucket carries over. */
+    public function testFullCarryOverWhenNothingTaken(): void
+    {
+        $user = $this->createEmployee();
+        $this->seedPreviousBalance($user, acquired: 0.0, acquiring: 10.0, taken: 0.0);
+
+        $this->runForJune2026();
+
+        $rolled = $this->balances->findOneForPeriod($user, AbsenceType::PaidLeave, '2026-2027');
+        self::assertNotNull($rolled);
+        self::assertEqualsWithDelta(10.0, $rolled->getAcquired(), 0.0001);
+    }
+
+    private function createEmployee(): User
+    {
+        $user = new User();
+        $user->setUsername('accrue-test-'.uniqid());
+        $user->setPassword('x');
+        $user->setRoles(['ROLE_USER']);
+        $user->setIsEmployee(true);
+        $user->setHireDate(new DateTimeImmutable('2024-01-01'));
+        $user->setReferencePeriodStart('06-01');
+        $user->setAnnualLeaveDays(25.0);
+        $user->setWorkTimeRatio(1.0);
+        $user->setInitialLeaveBalance(0.0);
+        $this->em->persist($user);
+        $this->em->flush();
+
+        return $user;
+    }
+
+    private function seedPreviousBalance(User $user, float $acquired, float $acquiring, float $taken): void
+    {
+        $balance = new AbsenceBalance();
+        $balance->setUser($user);
+        $balance->setType(AbsenceType::PaidLeave);
+        $balance->setPeriod('2025-2026');
+        $balance->setAcquired($acquired);
+        $balance->setAcquiring($acquiring);
+        $balance->setTaken($taken);
+        $this->em->persist($balance);
+        $this->em->flush();
+    }
+
+    private function runForJune2026(): void
+    {
+        $command = self::getContainer()->get(AccrueLeaveCommand::class);
+        $tester  = new CommandTester($command);
+        $tester->execute(['--month' => '2026-06']);
+        self::assertSame(0, $tester->getStatusCode());
+    }
+}
Author	SHA1	Message	Date
Matthieu	cf3d11a8a3	fix(absence) : déduire les jours pris du report CP au changement de période Pull Request — Quality gate / Frontend (build) (pull_request) Successful in 1m19s Details Pull Request — Quality gate / Backend (PHP CS + PHPUnit) (pull_request) Successful in 1m32s Details Au passage d'une période de référence, le report de l'"en cours d'acquisition" (N) vers l'"acquis" (N-1) ne déduisait pas les jours déjà pris : un salarié récupérait les CP qu'il avait consommés. Le report ne porte désormais que les jours non pris. Les congés sont imputés au plus ancien bucket d'abord (l'acquis N-2, qui expire de toute façon au changement de période), donc seuls les jours pris au-delà réduisent le report. Ajoute AccrueLeaveCommandTest couvrant le report avec jour pris, l'imputation oldest-first et le report intégral sans jour pris.	2026-06-24 10:52:05 +02:00
gitea-actions	b467dbc584	chore: bump version to v0.4.35 Auto Tag Develop / tag (push) Successful in 9s Details Build & Push Docker Image / build (push) Successful in 1m48s Details	2026-06-24 08:13:40 +00:00
matthieu	17a0566f77	Merge pull request 'Directory : onglet Informations éditable + refonte de l'onglet Rapport' (#21 ) from feat/directory-info-tab into develop Auto Tag Develop / tag (push) Successful in 8s Details Reviewed-on: #21	2026-06-24 08:13:32 +00:00
matthieu	68c3e6fbac	Merge branch 'develop' into feat/directory-info-tab Pull Request — Quality gate / Frontend (build) (pull_request) Successful in 41s Details Pull Request — Quality gate / Backend (PHP CS + PHPUnit) (pull_request) Successful in 57s Details	2026-06-24 08:10:10 +00:00
Matthieu	0f14f26fd3	refactor(directory) : gate report actions via RBAC permissions + guard report deletion Pull Request — Quality gate / Frontend (build) (pull_request) Successful in 39s Details Pull Request — Quality gate / Backend (PHP CS + PHPUnit) (pull_request) Successful in 1m0s Details - replace hardcoded ROLE_ADMIN check with usePermissions().can('directory.{clients,prospects}.manage') - rename misleading isAdmin prop to canManage in CommercialReportTab and ReportDocumentList - add busy guard on delete confirmation modal to prevent duplicate DELETE on double-click	2026-06-24 10:06:25 +02:00
Matthieu	80b2fa5ce6	feat(directory) : revamp commercial report tab and polish info tab Pull Request — Quality gate / Frontend (build) (pull_request) Successful in 39s Details Pull Request — Quality gate / Backend (PHP CS + PHPUnit) (pull_request) Successful in 1m31s Details - report tab redesigned as a reverse-chronological timeline with type badges/icons, relative dates and author - add/edit moved to a side drawer; body now uses the rich text editor (MalioInputRichText), displayed read-only as inline prose - delete now asks for confirmation (ConfirmDeleteReportModal) - empty state with CTA and pluralized count - info tab: use v-model, neutral i18n validation key, real admin flag instead of hardcoded true on CommercialReportTab	2026-06-24 09:34:58 +02:00
Matthieu	3fe108d38a	feat(directory) : add editable Information tab on client/prospect detail Add an Information tab (first, active by default) to the client and prospect detail pages so base fields can be edited directly from the record. Client: name/email/phone. Prospect: name/company/status/email/phone/source/notes. Fields are edited in memory and persisted only on explicit save (PATCH), matching the Contact/Address tabs pattern.	2026-06-24 09:07:13 +02:00