feat : creation du composant datatable (WIP)

# Conflicts:
#	frontend/pages/reception/finish-reception.vue
#	frontend/pages/shipment/finish-shipment.vue

CHANGELOG.md

@@ -49,7 +49,6 @@ Ajouter dans le fichier .env du frontend
 * fix layout admin
 * Creation page admin listing bovins
 * Creation page admin ajout/modification bovins
-* [#331] Mettre à jour l'entité Shipment et bovin_shipment
 ### Changed
 
 ### Fixed

config/packages/api_platform.yaml

@@ -3,6 +3,8 @@ api_platform:
     version: 1.0.0
     defaults:
         stateless: true
+        pagination_client_items_per_page: true
+        pagination_maximum_items_per_page: 100
         cache_headers:
             vary: ['Content-Type', 'Authorization', 'Origin']
     formats:

config/reference.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 // This file is auto-generated and is for apps only. Bundles SHOULD NOT rely on its content.
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
@@ -1472,7 +1470,7 @@ use Symfony\Component\Config\Loader\ParamConfigurator as Param;
  *     mercure?: bool|array{
  *         enabled?: bool|Param, // Default: false
  *         hub_url?: scalar|Param|null, // The URL sent in the Link HTTP header. If not set, will default to the URL for MercureBundle's default hub. // Default: null
- *         include_type?: bool|Param, // Always include @var in updates (including delete ones). // Default: false
+ *         include_type?: bool|Param, // Always include @type in updates (including delete ones). // Default: false
  *     },
  *     messenger?: bool|array{
  *         enabled?: bool|Param, // Default: false

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.52'
+    app.version: '0.0.51'

frontend/components/shipment/shipment-form.vue

@@ -152,9 +152,15 @@ import type {ShipmentFormData} from '~/services/dto/shipment-data'
 import {SUPPLIER_CODE} from "~/utils/constants"
 import {useAuthStore} from '~/stores/auth'
 import {useShipmentStore} from '~/stores/shipment'
-import {computed, reactive, ref, watch, onMounted} from 'vue'
+import { computed, reactive, ref, watch, onMounted } from 'vue'
 import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
 import {getShipmentTypeList} from "~/services/shipment-type";
+import {
+    createShipmentBovine,
+    deleteShipmentBovine,
+    getBovinShipmentList,
+    updateShipmentBovine
+} from "~/services/bovin-shipment";
 
 const users = ref<UserData[]>([])
 const customers = ref<CustomerData[]>([])
@@ -326,15 +332,23 @@ watch(
         form.carrierId = shipment?.carrier?.id ? String(shipment.carrier.id) : ''
         form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
         form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
+        if (!shipment || !shipment.bovinShipments) {
+            selectedShipmentTypeId.value = ''
+            shipmentQuantity.value = 0
+        } else {
+            const selectedEntry = shipment.bovinShipments.find((entry) => {
+                const typeId = entry.shipmentType?.id
+                return Boolean(typeId) && Number(entry.nbBovinSend ?? 0) > 0
+            }) ?? shipment.bovinShipments.find((entry) => Boolean(entry.shipmentType?.id))
 
-
-        selectedShipmentTypeId.value = shipment?.shipmentType?.id
-            ? String(shipment.shipmentType.id)
-            : ''
-
-        shipmentQuantity.value = shipment?.nbBovinSend ?? 0
-
-
+            if (!selectedEntry?.shipmentType?.id) {
+                selectedShipmentTypeId.value = ''
+                shipmentQuantity.value = 0
+            } else {
+                selectedShipmentTypeId.value = String(selectedEntry.shipmentType.id)
+                shipmentQuantity.value = selectedEntry.nbBovinSend ?? 0
+            }
+        }
         isHydrating.value = false
     },
     {immediate: true}
@@ -460,7 +474,68 @@ watch(
         }
     }
 )
+const buildDesiredBovinShipments = () => {
+    const typeId = Number(selectedShipmentTypeId.value)
+    if (!Number.isFinite(typeId)) {
+        return []
+    }
+    const type = bovineShipment.value.find((entry) => entry.id === typeId)
+    if (!type) {
+        return []
+    }
+    const raw = shipmentQuantity.value
+    const quantity = raw === null || raw === undefined ? 0 : Number(raw)
+    const normalizedQuantity = Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
+    if (normalizedQuantity <= 0) {
+        return []
+    }
 
+    return [{type, quantity: normalizedQuantity}]
+}
+const syncBovinShipments = async (
+    shipmentId: number,
+    existing: Array<{ id?: number; nbBovinSend: number | null; shipmentType?: unknown }> = []
+) => {
+    const shipmentIri = `/api/shipments/${shipmentId}`
+    const desired = buildDesiredBovinShipments()
+    const desiredByTypeId = new Map<number, number>()
+    for (const entry of desired) {
+        desiredByTypeId.set(entry.type.id, entry.quantity)
+    }
+    for (const entry of existing) {
+        if (!entry.id) {
+            continue
+        }
+        const rawType = entry.shipmentType
+        let typeId: number | null = null
+        if (rawType && typeof rawType === 'object' && 'id' in rawType) {
+            typeId = Number((rawType as { id: number }).id)
+        } else if (typeof rawType === 'string') {
+            const match = rawType.match(/\/shipment_types\/(\\d+)$/)
+            typeId = match ? Number(match[1]) : null
+        }
+        if (!typeId) {
+            continue
+        }
+        const desiredQuantity = desiredByTypeId.get(typeId)
+        if (!desiredQuantity) {
+            await deleteShipmentBovine(entry.id)
+            continue
+        }
+        if (entry.nbBovinSend !== desiredQuantity) {
+            await updateShipmentBovine(entry.id, {nbBovinSend: desiredQuantity})
+        }
+        desiredByTypeId.delete(typeId)
+    }
+
+    for (const [typeId, quantity] of desiredByTypeId.entries()) {
+        await createShipmentBovine({
+            shipment: shipmentIri,
+            shipmentType: `/api/shipment_types/${typeId}`,
+            nbBovinSend: quantity
+        })
+    }
+}
 const buildPayload = () => {
     const normalizedLicensePlate = form.licencePlate.trim()
     const normalizedShipmentDate = form.shipmentDate.trim()
@@ -488,14 +563,6 @@ const buildPayload = () => {
     const addressIri = normalizedAddressId
         ? `/api/addresses/${normalizedAddressId}`
         : null
-    const normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
-    const shipmentTypeIri = normalizedShipmentTypeId
-        ? `/api/shipment_types/${normalizedShipmentTypeId}`
-        : null
-
-    const rawQuantity = Number(shipmentQuantity.value ?? 0)
-    const normalizedQuantity = Number.isFinite(rawQuantity) ? Math.max(0,
-        Math.trunc(rawQuantity)) : 0
 
     return {
         licencePlate: normalizedLicensePlate,
@@ -505,19 +572,20 @@ const buildPayload = () => {
         carrier: carrierIri,
         driver: driverIri,
         user: userIri,
-        address: addressIri,
-        shipmentType: shipmentTypeIri,
-        nbBovinSend: normalizedQuantity,
+        address: addressIri
     }
 }
 
 const saveDraft = async () => {
     const payload = buildPayload()
     if (!shipmentStore.current) {
-        await shipmentStore.createShipment({
+        const created = await shipmentStore.createShipment({
             currentStep: 0,
             ...payload
         })
+        if (created) {
+            await syncBovinShipments(created.id, [])
+        }
         return
     }
 
@@ -525,6 +593,10 @@ const saveDraft = async () => {
         currentStep: shipmentStore.current.currentStep,
         ...payload
     })
+    await syncBovinShipments(
+        shipmentStore.current.id,
+        shipmentStore.current?.bovinShipments ?? []
+    )
 }
 
 defineExpose({saveDraft})
@@ -538,6 +610,7 @@ const validate = async () => {
         })
         if (created) {
             await shipmentStore.loadShipment(created.id)
+            await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
             await router.push(`/shipment/${created.id}`)
         }
         return
@@ -548,5 +621,6 @@ const validate = async () => {
         ...payload
     })
     await shipmentStore.loadShipment(shipmentStore.current.id)
+    await syncBovinShipments(shipmentStore.current.id, shipmentStore.current?.bovinShipments ?? [])
 }
 </script>

frontend/components/shipment/shipment-loading.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="flex flex-col items-center gap-[118px]">
-        <h1 class="font-bold text-5xl uppercase text-primary-500">Chargement des bovins</h1>
+        <h1 class="font-bold text-5xl uppercase text-primary-500">Charment des bovins</h1>
         <div
             class="w-full flex flex-col items-center justify-center">
             <UiLoadingDots />

frontend/components/ui/UiDataTable.vue

@@ -0,0 +1,436 @@
+<template>
+    <div class="mt-6 mx-[6px]">
+        <table class="w-full border border-slate-300 table-fixed">
+            <thead class="bg-slate-100 capitalize tracking-wide">
+            <tr>
+                <th
+                    v-for="column in normalizedColumns"
+                    :key="column.key"
+                    class="border border-slate-300 px-2 py-1"
+                >
+                    <div class="flex flex-col gap-1">
+                        <UiSelect
+                            v-if="column.isSearchable && column.type === 'selectTypeReception'"
+                            v-model="searchValues[column.key]"
+                            :placeholder="column.label"
+                            select-class="w-full !text-sm !py-1"
+                            :options="[
+                                    { value: '__all__', label: 'Tous' },
+                                    ...receptionTypes.map((type) => ({
+                                        value: type.label,
+                                        label: type.label
+                                    }))
+                                ]"
+                        />
+                        <UiSelect
+                            v-else-if="column.isSearchable && column.type === 'selectTypeShipment'"
+                            v-model="searchValues[column.key]"
+                            :placeholder="column.label"
+                            select-class="w-full !text-sm !py-1"
+                            :options="[
+                                    { value: '__all__', label: 'Tous' },
+                                    ...shipmentTypes.map((type) => ({
+                                        value: type.label,
+                                        label: type.label
+                                    }))
+                                ]"
+                        />
+                        <div v-else-if="column.isSearchable" class="relative">
+                            <UiTextInput
+                                v-model="searchValues[column.key]"
+                                :placeholder="column.label"
+                                input-class="min-w-full !text-sm !py-1 !pr-7"
+                            />
+                            <Icon
+                                name="gg:search"
+                                class="pointer-events-none absolute right-2 top-1/2 -translate-y-1/2 text-slate-400"
+                            />
+                        </div>
+                        <span v-else>{{ column.label }}</span>
+                    </div>
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-if="loading">
+                <td
+                    class="border border-slate-300 px-2 py-2 whitespace-pre-line"
+                    :colspan="normalizedColumns.length || 1"
+                >
+                    Chargement...
+                </td>
+            </tr>
+            <tr v-else-if="displayedRows.length === 0">
+                <td
+                    class="border border-slate-300 px-3 py-2 text-left text-slate-500"
+                    :colspan="normalizedColumns.length || 1"
+                >
+                    Aucune donnée
+                </td>
+            </tr>
+            <template v-else>
+                <tr
+                    v-for="(row, rowIndex) in displayedRows"
+                    class="hover:bg-primary-500 hover:bg-opacity-15"
+                    :key="rowIndex"
+                    :class="props.rowClickable ? 'cursor-pointer' : ''"
+                    @click="props.rowClickable ? onRowClick(row) : null"
+                >
+                    <td
+                        v-for="column in normalizedColumns"
+                        :key="column.key"
+                        class="border border-slate-300 px-2 py-2 whitespace-pre-line "
+                    >
+                        {{ formatColumnValue(row, column) }}
+                    </td>
+                </tr>
+            </template>
+            </tbody>
+        </table>
+
+        <div class="flex items-center justify-between mt-4">
+            <p class="text-slate-600">
+                {{ pageLabel }}
+            </p>
+            <div class="flex items-center gap-2">
+                <button
+                    type="button"
+                    class="rounded border border-slate-300 px-2 py-1 disabled:cursor-not-allowed disabled:opacity-50"
+                    :disabled="currentPage <= 1 || loading"
+                    @click="currentPage = currentPage - 1"
+                >
+                    Précédent
+                </button>
+                <button
+                    v-for="(item, index) in paginationItems"
+                    :key="`${item}-${index}`"
+                    type="button"
+                    class="min-w-9 rounded border px-2 py-1"
+                    :class="item === currentPage
+                            ? 'border-primary-500 bg-primary-500 text-white'
+                            : 'border-slate-300'"
+                    :disabled="loading || item === '...'"
+                    @click="typeof item === 'number' ? (currentPage = item) : null"
+                >
+                    {{ item }}
+                </button>
+
+                <button
+                    type="button"
+                    class="rounded border border-slate-300 px-2 py-1 disabled:cursor-not-allowed disabled:opacity-50"
+                    :disabled="currentPage >= totalPages || loading"
+                    @click="currentPage = currentPage + 1"
+                >
+                    Suivant
+                </button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {Row, ColumnConfig, AnyCollection, PaginationItem} from '~/services/dto/datatable-data'
+import {useApi} from '~/composables/useApi'
+import type {ReceptionTypeData} from '~/services/dto/reception-type-data'
+import {getReceptionTypeList} from '~/services/reception-type'
+import type {ShipmentTypeData} from "~/services/dto/shipment-data";
+import {getShipmentTypeList} from "~/services/shipment-type";
+
+const api = useApi()
+const receptionTypes = ref<ReceptionTypeData[]>([])
+const shipmentTypes = ref<ShipmentTypeData[]>([])
+const loading = ref(false)
+const currentPage = ref(1)
+const rows = ref<Row[]>([])
+const total = ref(0)
+const searchValues = reactive<Record<string, string>>({})
+const isNestedMode = computed(() => Boolean(props.responsePath))
+const effectiveTotal = computed(() => total.value)
+const emit = defineEmits<{
+    rowClick: [row: Row]
+}>()
+
+const props = withDefaults(defineProps<{
+    url?: string
+    responsePath?: string
+    columns?: ColumnConfig[]
+    query?: Record<string, unknown>
+    itemsPerPage?: number
+    rowClickable?: boolean
+}>(), {
+    url: '',
+    responsePath: '',
+    columns: () => [],
+    query: () => ({}),
+    itemsPerPage: 10,
+    rowClickable: true
+})
+const displayedRows = computed<Row[]>(() => {
+    if (!isNestedMode.value) return rows.value
+
+    const startIndex = (currentPage.value - 1) * props.itemsPerPage
+    const endIndex = startIndex + props.itemsPerPage
+    return rows.value.slice(startIndex, endIndex)
+})
+onMounted(async () => {
+    receptionTypes.value = await getReceptionTypeList()
+    shipmentTypes.value = await getShipmentTypeList()
+
+})
+const normalizedColumns = computed(() => {
+    if (props.columns.length > 0) {
+        return props.columns.map((column) => ({
+            key: column.key,
+            label: column.label ?? column.key,
+            format: column.format,
+            isSearchable: column.isSearchable ?? false,
+            type: column.type
+        }))
+    }
+
+    if (displayedRows.value.length === 0) {
+        return []
+    }
+
+    return Object.keys(displayedRows.value[0])
+        .filter((key) => !key.startsWith('@'))
+        .map((key) => ({
+            key,
+            label: key
+        }))
+})
+
+const totalPages = computed(() => Math.max(1, Math.ceil(effectiveTotal.value / props.itemsPerPage)))
+
+function getVisiblePages(page: number, lastPage: number): number[] {
+    const candidates = new Set([1, page - 1, page, page + 1, lastPage])
+    return Array.from(candidates)
+        .filter((p) => p >= 1 && p <= lastPage)
+        .sort((a, b) => a - b)
+}
+
+function insertEllipses(sortedPages: number[]): PaginationItem[] {
+    const items: PaginationItem[] = []
+
+    for (let i = 0; i < sortedPages.length; i++) {
+        const current = sortedPages[i]
+        const previous = sortedPages[i - 1]
+        if (previous != null && current - previous > 1) {
+            items.push('...')
+        }
+        items.push(current)
+    }
+    return items
+}
+
+const paginationItems = computed<PaginationItem[]>(() => {
+    const pages = getVisiblePages(currentPage.value, totalPages.value)
+    return insertEllipses(pages)
+})
+
+const pageLabel = computed(() => {
+    if (!effectiveTotal.value) return '0 résultat'
+
+    const start = (currentPage.value - 1) * props.itemsPerPage + 1
+    const end = Math.min(currentPage.value * props.itemsPerPage, effectiveTotal.value)
+
+    return `${start}-${end} sur ${effectiveTotal.value}`
+})
+
+watch(
+    () => [props.url, props.itemsPerPage, JSON.stringify(props.query ?? {}), props.responsePath],
+    async () => {
+        if (currentPage.value !== 1) {
+            currentPage.value = 1
+            if (!isNestedMode.value) return
+        }
+        await loadPage()
+    },
+    {immediate: true}
+)
+
+let timeout: ReturnType<typeof setTimeout>
+
+watch(
+    () => ({...searchValues}),
+    () => {
+        clearTimeout(timeout)
+        timeout = setTimeout(() => {
+            currentPage.value = 1
+            if (!isNestedMode.value) loadPage()
+        }, 750)
+    },
+    {deep: true}
+)
+
+watch(
+    () => currentPage.value,
+    async () => {
+        if (isNestedMode.value) return
+        await loadPage()
+    }
+)
+
+watch(
+    () => [totalPages.value, currentPage.value],
+    () => {
+        if (currentPage.value > totalPages.value) {
+            currentPage.value = totalPages.value
+        }
+    },
+    {immediate: true}
+)
+
+function buildDateInterval(value: string): { after: string; before: string } | null {
+    const trimmed = value.trim()
+
+    // YYYY
+    if (/^\d{4}$/.test(trimmed)) {
+        const year = Number(trimmed)
+        return {
+            after: `${year}-01-01`,
+            before: `${year + 1}-01-01`
+        }
+    }
+
+    // YYYY-MM
+    if (/^\d{4}-\d{2}$/.test(trimmed)) {
+        const [year, month] = trimmed.split('-').map(Number)
+
+        const nextMonth = month === 12 ? 1 : month + 1
+        const nextYear = month === 12 ? year + 1 : year
+
+        return {
+            after: `${year}-${String(month).padStart(2, '0')}-01`,
+            before: `${nextYear}-${String(nextMonth).padStart(2, '0')}-01`
+        }
+    }
+
+    // YYYY-MM-DD
+    if (/^\d{4}-\d{2}-\d{2}$/.test(trimmed)) {
+        const date = new Date(`${trimmed}T00:00:00`)
+        const nextDay = new Date(date)
+        nextDay.setDate(date.getDate() + 1)
+
+        const yyyy = nextDay.getFullYear()
+        const mm = String(nextDay.getMonth() + 1).padStart(2, '0')
+        const dd = String(nextDay.getDate()).padStart(2, '0')
+
+        return {
+            after: trimmed,
+            before: `${yyyy}-${mm}-${dd}`
+        }
+    }
+
+    return null
+}
+
+
+// Construit la requête, charge les données et normalise la réponse, puis met à jour rows et total
+async function loadPage(): Promise<void> {
+    if (!props.url) {
+        rows.value = []
+        total.value = 0
+        return
+    }
+
+    loading.value = true
+
+    try {
+        if (isNestedMode.value) {
+            const response = await api.get<Row>(props.url, props.query, {
+                headers: {
+                    Accept: 'application/ld+json'
+                }
+            })
+            const nestedRows = readPath(response, props.responsePath)
+            rows.value = Array.isArray(nestedRows) ? nestedRows as Row[] : []
+            total.value = rows.value.length
+            return
+        }
+        const searchQuery: Record<string, string> = {}
+
+        for (const column of normalizedColumns.value) {
+            if (!column.isSearchable) continue
+
+            const rawValue = searchValues[column.key] ?? ''
+            const raw = rawValue === '__all__' ? '' : rawValue.trim()
+            if (!raw) continue
+
+            const paramBase = column.key
+
+            if (column.type === 'date') {
+                const interval = buildDateInterval(raw)
+
+                if (interval) {
+                    searchQuery[`${paramBase}[after]`] = interval.after
+                    searchQuery[`${paramBase}[before]`] = interval.before
+                }
+
+                continue
+            }
+
+            searchQuery[paramBase] = raw
+        }
+
+        const requestQuery: Record<string, unknown> = {
+            ...props.query,
+            ...searchQuery,
+            page: currentPage.value,
+            itemsPerPage: props.itemsPerPage,
+        }
+
+        const response = await api.get<AnyCollection<Row> | Row[]>(props.url, requestQuery, {
+            headers: {
+                Accept: 'application/ld+json'
+            }
+        })
+
+        if (Array.isArray(response)) {
+            rows.value = response
+            total.value = response.length
+            return
+        }
+
+        const mappedRows = response['hydra:member'] ?? response.member ?? response.items ?? []
+        rows.value = Array.isArray(mappedRows) ? mappedRows : []
+        total.value = Number(response['hydra:totalItems'] ?? response.totalItems ?? rows.value.length)
+    } finally {
+        loading.value = false
+    }
+}
+
+function onRowClick(row: Row): void {
+    emit('rowClick', row)
+}
+
+// Lit une valeur imbriquée dans une ligne à partir d'un chemin de type "objet.sousObjet.cle".
+function readPath(source: Row, path: string): unknown {
+    return path.split('.').reduce<unknown>((acc, key) => (acc as Row | undefined)?.[key], source)
+}
+
+// Formate une valeur brute pour l'affichage dans une cellule (vide, tableau, objet ou valeur simple).
+function formatCell(value: unknown): string {
+    if (value == null || value === '') return '-'
+
+    if (Array.isArray(value)) return value.length ? value.map(formatCell).join(', ') : '-'
+
+    if (typeof value === 'object') {
+        const objectValue = value as Row
+        return String(objectValue.label ?? objectValue.name ?? objectValue.code ?? objectValue.id ?? '[object]')
+    }
+    return String(value)
+}
+
+function formatColumnValue(
+    row: Row,
+    column: { key: string; format?: (value: unknown, row: Row) => string }
+): string {
+    const value = readPath(row, column.key)
+    if (column.format) {
+        return column.format(value, row)
+    }
+
+    return formatCell(value)
+}
+</script>

frontend/pages/admin/carrier/carrier-list.vue

@@ -1,53 +1,43 @@
 <template>
-
     <div class="flex items-center justify-between ">
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
-            <NuxtLink
-                to="/admin/carrier"
-                class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
-            >
-                <Icon name="mdi:plus" size="28"  />
-                Ajouter
-            </NuxtLink>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
+        <NuxtLink
+            to="/admin/carrier"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
+        >
+            <Icon name="mdi:plus" size="28"/>
+            Ajouter
+        </NuxtLink>
     </div>
 
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Label</div>
-                <div>Code</div>
-            </div>
-            <div
-                v-for="carrier in carrierList"
-                :key="carrier.id"
-                class="grid grid-cols-2 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToCarrier(carrier.id)"
-                @keydown.enter="goToCarrier(carrier.id)"
-            >
-                <div>{{ carrier.name}}</div>
-                <div>{{ carrier.code }}</div>
-            </div>
-        </div>
-
+    <UiDataTable
+        :columns="columns"
+        url="carriers"
+        @row-click="onCarrierRowClick"
+    />
 </template>
 
 <script setup lang="ts">
-import type {CarrierData} from "~/services/dto/carrier-data";
-import {getCarrierList} from "~/services/carrier";
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data";
 
-const carrierList = ref<CarrierData[]>()
 const router = useRouter()
 
+const columns: ColumnConfig[] = [
+    {key: "name", label: "Label"},
+    {key: "code", label: "Code"},
+]
+
 const goToCarrier = (id: number) => {
     router.push(`/admin/carrier/${id}`)
 }
 
+const onCarrierRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
+        goToCarrier(id)
+}
+
 definePageMeta({
     layout: 'default'
 })
-
-onMounted(async () => {
-    carrierList.value = await getCarrierList(false)
-})
 </script>

frontend/pages/admin/customer/[[id]].vue

@@ -32,45 +32,15 @@
                 Ajouter
             </UiButton>
         </div>
-        <div class="overflow-x-auto mb-10">
-            <table class="w-full border-collapse">
-                <thead>
-                <tr class="text-left border-b border-gray-200">
-                    <th class="py-3 pr-4 text-sm uppercase">Libellé</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Rue</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Complément</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Code postal</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Ville</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Pays</th>
-                </tr>
-                </thead>
-                <tbody>
-                <template v-if="form.addresses.length === 0">
-                    <tr>
-                        <td colspan="6" class="py-4 text-slate-400">
-                            Aucune adresse.
-                        </td>
-                    </tr>
-                </template>
-                <template v-else>
-                    <tr
-                        v-for="(address, index) in form.addresses"
-                        :key="address.id ?? index"
-                        class="border-b border-gray-100 hover:bg-slate-50"
-                        :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
-                        @click="goToEditAddress(address.id ?? null)"
-                    >
-                        <td class="py-3 pr-4">{{ address.label || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.city || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
-                    </tr>
-                </template>
-                </tbody>
-            </table>
-        </div>
+        <UiDataTable
+            class="mb-10"
+            :columns="addressColumns"
+            :url="customerId !== null ? `customers/${customerId}` : ''"
+            response-path="addresses"
+            :items-per-page="5"
+            :row-clickable="auth.isAdmin"
+            @row-click="onAddressRowClick"
+        />
     </form>
 </template>
 
@@ -78,6 +48,7 @@
 import {computed, reactive, ref, watch} from "vue"
 import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
 import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data"
 import {useAuthStore} from "~/stores/auth"
 
 definePageMeta({layout: "default"})
@@ -100,6 +71,14 @@ const form = reactive<CustomerFormData>({
     email: "",
     addresses: [],
 })
+const addressColumns: ColumnConfig[] = [
+    {key: "label", label: "Libellé"},
+    {key: "street", label: "Rue"},
+    {key: "street2", label: "Complément"},
+    {key: "postalCode", label: "Code postal"},
+    {key: "city", label: "Ville"},
+    {key: "countryCode", label: "Pays"},
+]
 
 const goToAddAddress = () => {
     if (customerId.value === null || !auth.isAdmin) return
@@ -122,29 +101,16 @@ const goToEditAddress = (addressId: number | null) => {
     })
 }
 
+const onAddressRowClick = (row: Row) => {
+    const id = Number(row.id)
+    goToEditAddress(Number.isFinite(id) ? id : null)
+}
+
 const hydrateFromCustomer = (customer: CustomerData | null) => {
     if (!customer) return
     form.name = customer.name ?? ""
     form.phone = customer.phone ?? ""
     form.email = customer.email ?? ""
-    if (!Array.isArray(customer.addresses) || customer.addresses.length === 0) {
-        form.addresses = []
-        return
-    }
-    if (typeof customer.addresses[0] === "string") {
-        form.addresses = []
-        return
-    }
-
-    form.addresses = customer.addresses.map((address) => ({
-        id: address.id ?? null,
-        label: address.label ?? "",
-        street: address.street ?? "",
-        street2: address.street2 ?? null,
-        postalCode: address.postalCode ?? "",
-        city: address.city ?? "",
-        countryCode: address.countryCode ?? "",
-    }))
 }
 
 watch(

frontend/pages/admin/customer/customer-list.vue

@@ -12,106 +12,48 @@
         </NuxtLink>
     </div>
 
-    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
-        <div class="max-h-96 overflow-y-auto">
-            <div
-                class="sticky top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
-            >
-                <div>Nom</div>
-                <div>Téléphone</div>
-                <div>Email</div>
-                <div>Rue</div>
-                <div>Complément</div>
-                <div>Code Postal</div>
-                <div>Ville</div>
-                <div>Pays</div>
-            </div>
-
-            <div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun client.
-            </div>
-
-            <div v-for="customer in customerList" :key="customer.id">
-                <div
-                    v-if="!customer.addresses || customer.addresses.length === 0"
-                    class="grid grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
-                    @click="goToCustomer(customer.id)"
-                >
-                    <div class="truncate">{{ customer.name || "—" }}</div>
-                    <div class="truncate">{{ customer.phone || "—" }}</div>
-                    <div class="truncate">{{ customer.email || "—" }}</div>
-                    <div class="col-span-1">Pas d'adresse</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                </div>
-
-                <template v-else-if="customer.addresses.length > 0">
-                    <div
-                        v-for="(address, idx) in customer.addresses"
-                        :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
-                        @click="goToCustomer(customer.id)"
-                    >
-                        <div class="truncate">
-                            {{ idx === 0 ? (customer.name || "—") : "↳" }}
-                        </div>
-                        <div class="truncate">{{ idx === 0 ? (customer.phone || "—") : ""  }}</div>
-                        <div class="truncate">{{ idx === 0 ? (customer.email || "—") : ""  }}</div>
-                        <div class="truncate">{{ address.street || "—" }}</div>
-                        <div class="truncate">{{ address.street2 || "—" }}</div>
-                        <div>{{ address.postalCode || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.city || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
-                    </div>
-                </template>
-
-                <template v-else>
-                    <div
-                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        @click="goToCustomer(customer.id)"
-                    >
-                        <div class="truncate">{{ customer.name || "—" }}</div>
-                        <div class="truncate">{{ customer.phone || "—" }}</div>
-                        <div class="truncate">{{ customer.email || "—" }}</div>
-                        <div class="col-span-5 text-slate-400">
-                            Adresses non chargées
-                        </div>
-                    </div>
-                </template>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        v-if="auth.isAdmin"
+        :columns="columns"
+        url="customers"
+        @row-click="onCustomerRowClick"
+    />
     <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
         Accès réservé aux administrateurs.
     </div>
 </template>
 
 <script setup lang="ts">
-import { getCustomerList } from "~/services/customer"
-import type { CustomerData } from "~/services/dto/customer-data"
+import type { ColumnConfig, Row } from "~/services/dto/datatable-data"
+import { formatAddresses } from "~/utils/datatable-formatters"
 import { useAuthStore } from "~/stores/auth"
 
 definePageMeta({ layout: "default" })
 
-const customerList = ref<CustomerData[]>([])
 const router = useRouter()
 const auth = useAuthStore()
 
+const columns: ColumnConfig[] = [
+    { key: "name", label: "Nom", isSearchable:true},
+    { key: "phone", label: "Téléphone" },
+    { key: "email", label: "Email" },
+    { key: "addresses", label: "Adresses", format: formatAddresses  },
+]
+
 const goToCustomer = (id: number) => {
     if (!auth.isAdmin) return
     router.push(`/admin/customer/${id}`)
 }
 
+const onCustomerRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
+    goToCustomer(id)
+}
+
 const handleAddClick = (event: Event) => {
     if (auth.isAdmin) return
     event.preventDefault()
 }
 
-onMounted(async () => {
-    if (!auth.isAdmin) return
-    customerList.value = await getCustomerList()
-})
 </script>

frontend/pages/admin/supplier/[[id]].vue

@@ -32,45 +32,15 @@
                 Ajouter
             </UiButton>
         </div>
-        <div class="overflow-x-auto mb-10">
-            <table class="w-full border-collapse">
-                <thead>
-                <tr class="text-left border-b border-gray-200">
-                    <th class="py-3 pr-4 text-sm uppercase">Libellé</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Rue</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Complément</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Code postal</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Ville</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Pays</th>
-                </tr>
-                </thead>
-                <tbody>
-                <template v-if="form.addresses.length === 0">
-                    <tr>
-                        <td colspan="6" class="py-4 text-slate-400">
-                            Aucune adresse.
-                        </td>
-                    </tr>
-                </template>
-                <template v-else>
-                    <tr
-                        v-for="(address, index) in form.addresses"
-                        :key="address.id ?? index"
-                        class="border-b border-gray-100 hover:bg-slate-50"
-                        :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
-                        @click="goToEditAddress(address.id ?? null)"
-                    >
-                        <td class="py-3 pr-4">{{ address.label || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.city || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
-                    </tr>
-                </template>
-                </tbody>
-            </table>
-        </div>
+        <UiDataTable
+            class="mb-10"
+            :columns="addressColumns"
+            :url="supplierId !== null ? `suppliers/${supplierId}` : ''"
+            response-path="addresses"
+            :items-per-page="5"
+            :row-clickable="auth.isAdmin"
+            @row-click="onAddressRowClick"
+        />
     </form>
 </template>
 
@@ -78,6 +48,7 @@
 import {computed, reactive, ref, watch} from "vue"
 import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
 import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data"
 import {useAuthStore} from "~/stores/auth"
 
 definePageMeta({layout: "default"})
@@ -100,6 +71,14 @@ const form = reactive<SupplierFormData>({
     phone: "",
     addresses: [],
 })
+const addressColumns: ColumnConfig[] = [
+    {key: "label", label: "Libellé"},
+    {key: "street", label: "Rue"},
+    {key: "street2", label: "Complément"},
+    {key: "postalCode", label: "Code postal"},
+    {key: "city", label: "Ville"},
+    {key: "countryCode", label: "Pays"},
+]
 
 const goToAddAddress = () => {
     if (supplierId.value === null || !auth.isAdmin) return
@@ -124,29 +103,16 @@ const goToEditAddress = (addressId: number | null) => {
     })
 }
 
+const onAddressRowClick = (row: Row) => {
+    const id = Number(row.id)
+    goToEditAddress(Number.isFinite(id) ? id : null)
+}
+
 const hydrateFromSupplier = (supplier: SupplierData | null) => {
     if (!supplier) return
     form.name = supplier.name ?? ""
     form.email = supplier.email ?? ""
     form.phone = supplier.phone ?? ""
-    if (!Array.isArray(supplier.addresses) || supplier.addresses.length === 0) {
-        form.addresses = []
-        return
-    }
-    if (typeof supplier.addresses[0] === "string") {
-        form.addresses = []
-        return
-    }
-
-    form.addresses = supplier.addresses.map((address) => ({
-        id: address.id ?? null,
-        label: address.label ?? "",
-        street: address.street ?? "",
-        street2: address.street2 ?? null,
-        postalCode: address.postalCode ?? "",
-        city: address.city ?? "",
-        countryCode: address.countryCode ?? "",
-    }))
 }
 
 watch(

frontend/pages/admin/supplier/supplier-list.vue

@@ -12,102 +12,47 @@
         </NuxtLink>
     </div>
 
-    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
-        <div class="max-h-96 overflow-y-auto">
-            <div
-                class="sticky top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
-            >
-                <div>Nom</div>
-                <div>Mail</div>
-                <div>Rue</div>
-                <div>Complément</div>
-                <div>Code Postal</div>
-                <div>Ville</div>
-                <div>Pays</div>
-            </div>
-
-            <div v-if="supplierList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun fournisseur.
-            </div>
-
-            <div v-for="supplier in supplierList" :key="supplier.id">
-                <div
-                    v-if="!supplier.addresses || supplier.addresses.length === 0"
-                    class="grid grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
-                    @click="goToSupplier(supplier.id)"
-                >
-                    <div class="truncate">{{ supplier.name }}</div>
-                    <div class="truncate">{{ supplier.email }}</div>
-                    <div class="col-span-1">Pas d'adresse</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                </div>
-
-                <template v-else-if="supplier.addresses.length > 0">
-                    <div
-                        v-for="(address, idx) in supplier.addresses"
-                        :key="address.id ?? `${supplier.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
-                        @click="goToSupplier(supplier.id)"
-                    >
-                        <div class="truncate">
-                            {{ idx === 0 ? supplier.name : "↳" }}
-                        </div>
-                        <div class="truncate">{{ idx === 0 ? supplier.email : ""  }}</div>
-                        <div class="truncate">{{ address.street || "—" }}</div>
-                        <div class="truncate">{{ address.street2 || "—" }}</div>
-                        <div>{{ address.postalCode || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.city || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
-                    </div>
-                </template>
-
-                <template v-else>
-                    <div
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        @click="goToSupplier(supplier.id)"
-                    >
-                        <div class="truncate">{{ supplier.name }}</div>
-                        <div class="truncate">{{ supplier.email }}</div>
-                        <div class="col-span-5 text-slate-400">
-                            Adresses non chargées
-                        </div>
-                    </div>
-                </template>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        v-if="auth.isAdmin"
+        :columns="columns"
+        url="suppliers"
+        @row-click="onSupplierRowClick"
+    />
     <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
         Accès réservé aux administrateurs.
     </div>
 </template>
 
 <script setup lang="ts">
-import { getSupplierList } from "~/services/supplier"
-import type { SupplierData } from "~/services/dto/supplier-data"
+import type { ColumnConfig, Row } from "~/services/dto/datatable-data"
+import {formatAddresses} from "~/utils/datatable-formatters"
 import { useAuthStore } from "~/stores/auth"
 
 definePageMeta({ layout: "default" })
 
-const supplierList = ref<SupplierData[]>([])
 const router = useRouter()
 const auth = useAuthStore()
 
+const columns: ColumnConfig[] = [
+    { key: "name", label: "Nom", isSearchable:true },
+    { key: "email", label: "Mail" },
+    { key: "addresses", label: "Adresses",  format: formatAddresses },
+]
+
 const goToSupplier = (id: number) => {
     if (!auth.isAdmin) return
     router.push(`/admin/supplier/${id}`)
 }
 
+const onSupplierRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
+    goToSupplier(id)
+}
+
 const handleAddClick = (event: Event) => {
     if (auth.isAdmin) return
     event.preventDefault()
 }
 
-onMounted(async () => {
-    if (!auth.isAdmin) return
-    supplierList.value = await getSupplierList()
-})
 </script>

frontend/pages/admin/user/list.vue

@@ -11,29 +11,11 @@
 
     </div>
 
-    <div>
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-3 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Username</div>
-                <div>Role</div>
-            </div>
-            <div
-                v-for="user in userList"
-                :key="user.id"
-                class="grid grid-cols-3 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t items-center"
-                role="button"
-                tabindex="0"
-                @click="goToUser(user.id)"
-            >
-                <div>
-                    {{ user.username }}
-                </div>
-                <div>
-                    {{ getRoleLabels(user.roles) }}
-                </div>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        :columns="columns"
+        url="admin/users"
+        @row-click="onUserRowClick"
+    />
 </template>
 
 
@@ -42,29 +24,21 @@ definePageMeta({
     layout: 'default'
 })
 
-import type {UserData} from "~/services/dto/user-data";
-import {getAdminUsers} from "~/services/auth";
 import {ROLE} from "~/utils/constants";
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data";
+import {formatRoleLabels} from "~/utils/datatable-formatters";
 
-const userList = ref<UserData[]>([])
 const router = useRouter()
 const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))
 
-const goToUser = (id: number) => {
+const columns: ColumnConfig[] = [
+    { key: "username", label: "Username" },
+    { key: "roles", label: "Role", format: (value) => formatRoleLabels(value, roleLabelByValue) },
+]
+
+const onUserRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
     router.push(`/admin/user/${id}`)
 }
-
-const getRoleLabels = (roles?: string[]) => {
-    if (!roles || roles.length === 0) {
-        return ' ---'
-    }
-
-    return roles
-        .map((role) => roleLabelByValue.get(role) ?? role)
-        .join(', ')
-}
-
-onMounted(async () => {
-    userList.value = await getAdminUsers()
-})
 </script>

frontend/pages/index.vue

@@ -5,12 +5,12 @@
         <card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
         <card-link label="NOUVELLE EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
         <card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
-        <card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
+        <card-link label="" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
             <template #label>
                 Réceptions<br>EN ATTENTE
             </template>
         </card-link>
-        <card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
+        <card-link label=""  link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
             <template #label>
                 EXPÉDITIONS<br>EN ATTENTE
             </template>
@@ -18,7 +18,7 @@
         <card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-outline" />
         <card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
         <card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
-        <card-link link="/" iconName="mdi:cow">
+        <card-link label=""  link="/" iconName="mdi:cow">
             <template #label>
                 PASSEPORT<br>DU BOVIN
             </template>

frontend/pages/reception/finish-reception.vue

@@ -4,59 +4,36 @@
             <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
     </div>
 
-    <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Numéro</div>
-                <div>Date</div>
-                <div>Fournisseur</div>
-                <div>Adresse</div>
-                <div>Type réception</div>
-                <div>Poids</div>
-            </div>
-            <div
-                v-for="reception in receptionList"
-                :key="reception.id"
-                class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToReception(reception.id)"
-            >
-                <div>{{ reception.identificationNumber}}</div>
-                <div>{{ reception.receptionDate}}</div>
-                <div>{{ reception.supplier?.name }}</div>
-                <div>{{ reception.address?.fullAddress }}</div>
-                <div>{{ reception.receptionType?.label }}</div>
-                <div>{{ formatWeighing(reception) }}</div>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        :columns="columns"
+        url="receptions"
+        class="ps-20"
+        :query="{ isValid: true }"
+        @row-click="goToReception"
+    />
 </template>
 
 <script setup lang="ts">
-import type {ReceptionData} from "~/services/dto/reception-data";
-import {getReceptionList} from "~/services/reception";
-import type {ShipmentData} from "~/services/dto/shipment-data";
 
-const receptionList = ref<ReceptionData[]>()
-const router = useRouter()
+import {formatWeights} from "~/utils/datatable-formatters";
 
-const formatWeighing = (reception: ReceptionData) => {
-    const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
-    const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
-
-    if (gross == null || tare == null) {
-        return '—'
-    }
-
-    return `${gross - tare} kg`
+type ReceptionRow = {
+    id?: number | string
 }
 
-const goToReception = (id: number) => {
+const router = useRouter()
+const columns = [
+    { key: 'identificationNumber', label: 'Numero', isSearchable:true },
+    { key: 'receptionDate', label: 'Date de livraison', isSearchable: true, type: 'date' },
+    { key: 'supplier.name', label: 'Fournisseur', isSearchable: true },
+    { key: 'address.fullAddress', label: 'Adresse', isSearchable: true },
+    { key: 'receptionType.label', label: 'Type', isSearchable: true, type:'selectTypeReception' },
+    { key: 'weights', label: 'Poids', format: formatWeights }
+]
+
+const goToReception = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
     router.push(`/reception/update/${id}`)
 }
-
-onMounted(async () => {
-    receptionList.value = await getReceptionList(true)
-})
 </script>

frontend/pages/reception/waiting-reception.vue

@@ -1,51 +1,36 @@
 <template>
-    <div class="flex items-center justify-between">
-        <div class="flex items-center gap-10">
+    <div class="flex items-center justify-start gap-10">
             <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
             <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
-        </div>
-    </div>
-
-    <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16">
-            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Fournisseur</div>
-                <div>Adresse</div>
-                <div>Type réception</div>
-                <div>Transporteur</div>
-                <div>Immatriculation</div>
-            </div>
-            <div
-                v-for="reception in receptionList"
-                :key="reception.id"
-                class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToReception(reception.id)"
-                @keydown.enter="goToReception(reception.id)"
-            >
-                <div>{{ reception.supplier?.name }}</div>
-                <div>{{ reception.address?.fullAddress }}</div>
-                <div>{{ reception.receptionType?.label }}</div>
-                <div>{{ reception.carrier?.name }}</div>
-                <div>{{ reception.licensePlate }}</div>
-            </div>
-        </div>
     </div>
+    <UiDataTable
+        :columns="columns"
+        url="receptions"
+        :query="{ isValid: false }"
+        @row-click="goToReception"
+    />
 </template>
 
 <script setup lang="ts">
-import type {ReceptionData} from "~/services/dto/reception-data";
-import {getReceptionList} from "~/services/reception";
-
-const receptionList = ref<ReceptionData[]>()
 const router = useRouter()
 
-const goToReception = (id: number) => {
+
+
+const columns = [
+    {key: 'supplier.name', label: 'Fournisseur', isSearchable:true},
+    { key: 'address.fullAddress', label: 'Adresse', isSearchable: true },
+    {key: 'carrier.name', label: 'Transporteur', isSearchable:true},
+    {key: 'receptionType.label', label: 'Type', isSearchable:true, type:'selectTypeReception'},
+    {key: 'licensePlate', label: 'Immatriculation', isSearchable:true, type:'licensePlate'},
+]
+
+
+type ReceptionRow = {
+    id?: number | string
+}
+const goToReception = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
         router.push(`/reception/${id}`)
 }
-
-onMounted(async () => {
-    receptionList.value = await getReceptionList(false)
-})
 </script>

frontend/pages/shipment/finish-shipment.vue

@@ -4,82 +4,32 @@
         <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
     </div>
 
-    <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Numéro</div>
-                <div>Date</div>
-                <div>Client</div>
-                <div>Adresse</div>
-                <div>Type d'expéditon</div>
-                <div>Poids</div>
-            </div>
-            <div
-                v-for="shipment in shipmentList"
-                :key="shipment
-               .id"
-                class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goShipment(shipment.id)"
-            >
-                <div>{{ shipment.identificationNumber }}</div>
-                <div>{{ shipment.shipmentDate }}</div>
-                <div>{{ shipment.customer?.name }}</div>
-                <div>{{ shipment.address?.fullAddress }}</div>
-                <div>
-                    <template v-if="formatShipmentLines(shipment).length">
-                        <div
-                            v-for="(line, index) in formatShipmentLines(shipment)"
-                            :key="index"
-                            class="leading-5"
-                        >
-                            {{ line }}
-                        </div>
-                    </template>
-                </div>
-                <div>{{ formatWeighing(shipment) }}</div>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        :columns="columns"
+        url="shipments"
+        :query="{ isValid: true }"
+        @row-click="goToShipment"
+    />
 </template>
 
 <script setup lang="ts">
-import type {ShipmentData} from "~/services/dto/shipment-data";
-import {getShipmentList} from "~/services/shipment";
+import {formatBovinShipments, formatWeights} from "~/utils/datatable-formatters";
 
-const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()
-
-const formatWeighing = (shipment: ShipmentData) => {
-    const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
-    const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
-
-    if (gross == null || tare == null) {
-        return '—'
-    }
-
-    return `${gross - tare} kg`
+const columns = [
+    {key: 'identificationNumber', label: 'Numero',isSearchable:true},
+    {key: 'shipmentDate', label: 'Date de livraison',isSearchable:true, type:'date'},
+    {key: 'customer.name', label: 'Client',isSearchable:true},
+    {key: 'address.fullAddress', label: 'Adresse',isSearchable:true},
+    {key: 'bovinShipments', label: 'Type', format:formatBovinShipments},
+    {key: 'weights', label: 'Poids', format: formatWeights}
+]
+type ReceptionRow = {
+    id?: number | string
 }
-
-
-const formatShipmentLines = (shipment: ShipmentData) => {
-    if (!shipment.shipmentType && shipment.nbBovinSend == null) {
-        return []
-    }
-
-    const label = typeof shipment.shipmentType === 'string'
-        ? shipment.shipmentType
-        : shipment.shipmentType?.label
-
-    return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
-}
-
-const goShipment = (id: number) => {
+const goToShipment = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
     router.push(`/shipment/update/${id}`)
 }
-
-onMounted(async () => {
-    shipmentList.value = await getShipmentList(true)
-})
 </script>

frontend/pages/shipment/waiting-shipment.vue

@@ -5,70 +5,34 @@
             <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
         </div>
     </div>
-
-    <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Client</div>
-                <div>Adresse</div>
-                <div>Type d'expéditions</div>
-                <div>Transporteur</div>
-                <div>Immatriculation</div>
-            </div>
-            <div
-                v-for="shipment in shipmentList"
-                :key="shipment.id"
-                class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToShipment(shipment.id)"
-                @keydown.enter="goToShipment(shipment.id)"
-            >
-                <div>{{ shipment.customer?.name }}</div>
-                <div>{{ shipment.address?.fullAddress }}</div>
-                <div>
-                    <template v-if="formatShipmentLines(shipment).length">
-                        <div
-                            v-for="(line, index) in formatShipmentLines(shipment)"
-                            :key="index"
-                            class="leading-5"
-                        >
-                            {{ line }}
-                        </div>
-                    </template>
-                </div>
-                <div>{{ shipment.carrier?.name }}</div>
-                <div>{{ shipment.licencePlate }}</div>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        :columns="columns"
+        url="shipments"
+        :query="{ isValid: false }"
+        @row-click="goToShipment"
+    />
 </template>
 
 <script setup lang="ts">
+import {formatBovinShipments} from "~/utils/datatable-formatters";
 
-import type {ShipmentData} from "~/services/dto/shipment-data";
-import {getShipmentList} from "~/services/shipment";
-
-const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()
 
-const goToShipment = (id: number) => {
+const columns = [
+    {key: 'customer.name', label: 'Client', isSearchable:true},
+    {key: 'address.fullAddress', label: 'Adresse', isSearchable:true},
+    {key: 'carrier.name', label: 'Transporteur', isSearchable:true},
+    {key: 'bovinShipments', label: 'Type', format:formatBovinShipments},
+    {key: 'licencePlate', label: 'Immatriculation', isSearchable:true},
+]
+
+type ReceptionRow = {
+    id?: number | string
+}
+
+const goToShipment = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
     router.push(`/shipment/${id}`)
 }
-
-const formatShipmentLines = (shipment: ShipmentData) => {
-    if (!shipment.shipmentType && shipment.nbBovinSend == null) {
-        return []
-    }
-
-    const label = typeof shipment.shipmentType === 'string'
-        ? shipment.shipmentType
-        : shipment.shipmentType?.label
-
-    return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
-}
-
-onMounted(async () => {
-    shipmentList.value = await getShipmentList(false)
-})
 </script>

frontend/services/bovin-shipment.ts

@@ -0,0 +1,50 @@
+import { useApi } from '~/composables/useApi'
+import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
+import type { ShipmentBovinePayload, BovinShipmentListResponse } from '~/services/dto/bovin-shipment-data'
+
+export async function getBovinShipmentList(
+    shipmentIri: string
+): Promise<BovinShipmentData[]> {
+    const api = useApi()
+    const response = await api.get<BovinShipmentListResponse>(
+        'bovin_shipments',
+        { shipment: shipmentIri },
+        {
+            toastErrorKey: 'errors.shipmentBovine.list'
+        }
+    )
+
+    if (Array.isArray(response)) {
+        return response
+    }
+    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
+        return response['hydra:member']
+    }
+    return []
+}
+
+export async function createShipmentBovine(
+    payload: ShipmentBovinePayload
+): Promise<BovinShipmentData> {
+    const api = useApi()
+    return api.post<BovinShipmentData>('bovin_shipments', payload, {
+        toastErrorKey: 'errors.shipmentBovine.create'
+    })
+}
+
+export async function deleteShipmentBovine(id: number): Promise<void> {
+    const api = useApi()
+    await api.delete<void>(`bovin_shipments/${id}`, {}, {
+        toastErrorKey: 'errors.shipmentBovine.delete'
+    })
+}
+
+export async function updateShipmentBovine(
+    id: number,
+    payload: Partial<ShipmentBovinePayload>
+): Promise<BovinShipmentData> {
+    const api = useApi()
+    return api.patch<BovinShipmentData>(`bovin_shipments/${id}`, payload, {
+        toastErrorKey: 'errors.shipmentBovine.update'
+    })
+}

frontend/services/dto/bovin-shipment-data.ts

@@ -0,0 +1,18 @@
+import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
+
+export interface BovinShipmentData {
+    id: number
+    nbBovinSend: number | null
+    shipment?: string | null
+    shipmentType?: ShipmentTypeData | null
+}
+
+export type ShipmentBovinePayload = {
+    nbBovinSend: number
+    shipment: string
+    shipmentType: string
+}
+
+export type BovinShipmentListResponse =
+    | BovinShipmentData[]
+    | { 'hydra:member'?: BovinShipmentData[] }

frontend/services/dto/datatable-data.ts

@@ -0,0 +1,20 @@
+export type Row = Record<string, unknown>
+
+export type ColumnConfig = {
+    key: string
+    label?: string
+    format?: (value: unknown, row: Row) => string
+    isSearchable?: boolean
+    type?: string
+}
+type HydraCollection<T> = {
+    'hydra:member': T[]
+    'hydra:totalItems': number
+}
+export type AnyCollection<T> = HydraCollection<T> & {
+    member?: T[]
+    items?: T[]
+    totalItems?: number
+}
+
+export type PaginationItem = number | '...'

frontend/services/dto/shipment-data.ts

@@ -9,6 +9,12 @@ export interface ShipmentTypeData {
     code: string
 }
 
+export interface BovinShipmentData {
+    id?: number
+    shipmentType?: ShipmentTypeData | string | null
+    nbBovinSend: number | null
+}
+
 export type ShipmentData = {
     id: number
     identificationNumber?: string | null
@@ -20,8 +26,7 @@ export type ShipmentData = {
     carrier?: CarrierData | null
     truck?: TruckData | null
     customer?: CustomerData | null
-    shipmentType?: ShipmentTypeData | null
-    nbBovinSend?: number | null
+    bovinShipments?: BovinShipmentData[] | null
     weights?: WeightShipmentEntryData[] | null
 
 }
@@ -54,9 +59,9 @@ export type ShipmentPayload = {
     carrier?: string | null
     truck?: string | null
     customer?: string | null
+    bovinShipments?: string[] | null
     address?: string | null
     user?: string | null
     driver?: string | null
-    shipmentType?: string | null
-    nbBovinSend?: number | null
+
 }

frontend/utils/datatable-formatters.ts

@@ -0,0 +1,70 @@
+export const formatBovinShipments = (value: unknown): string => {
+    if (!Array.isArray(value) || value.length === 0) return '-'
+    return value.map((item: any) => {
+        const label = item?.shipmentType?.label ?? item?.shipmentType?.code ??
+            'Type inconnu'
+        const qty = item?.nbBovinSend ?? '-'
+        return `${label} : ${qty}`
+    }).join(', ')
+}
+
+export const formatWeights = (value: unknown): string => {
+    if (!Array.isArray(value) || value.length === 0) return '-'
+
+    let gross = 0
+    let tare = 0
+
+    for (const item of value as Array<{ type?: string; weight?:
+            unknown }>) {
+        const w = Number(item.weight)
+        if (!Number.isFinite(w)) continue
+        if (item.type === 'gross') gross += w
+        else if (item.type === 'tare') tare += w
+    }
+
+    return `${gross - tare} kg`
+}
+
+export const formatRoleLabels = (
+    value: unknown,
+    roleLabelByValue: Map<string, string>,
+): string => {
+    if (!Array.isArray(value) || value.length === 0) {
+        return ' - '
+    }
+
+    return value
+        .map((role) => {
+            const key = String(role)
+            return roleLabelByValue.get(key) ?? key
+        })
+        .join(', ')
+}
+
+export const formatAddresses = (value: unknown): string => {
+    if (!Array.isArray(value) || value.length === 0) {
+        return " - "
+    }
+
+    if (typeof value[0] === 'string') {
+        return 'Adresses non chargées'
+    }
+
+    return value
+        .map((item) => {
+            if (!item || typeof item !== 'object') return '-'
+            const address = item as Record<string, unknown>
+            const street = String(address.street ?? '').trim()
+            const street2 = String(address.street2 ?? '').trim()
+            const postalCode = String(address.postalCode ?? '').trim()
+            const city = String(address.city ?? '').trim()
+            const countryCode = String(address.countryCode ?? '').trim().toUpperCase()
+
+            const firstLine = [street, street2].filter(Boolean).join(', ')
+            const secondLine = [postalCode, city].filter(Boolean).join(' ')
+            const finalLine = [firstLine, secondLine, countryCode].filter(Boolean).join(', ')
+
+            return finalLine || '-'
+        })
+        .join('\n')
+}

migrations/Version20260218093842.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260218093842 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE address ADD full_address VARCHAR(400)');
+        $this->addSql('DROP INDEX idx_7049f4507be036fc');
+        $this->addSql('DROP INDEX uniq_weight_shipment_type');
+        $this->addSql('DROP INDEX uniq_weight_reception_type');
+        $this->addSql('ALTER INDEX idx_weight_shipment RENAME TO IDX_7CD55417BE036FC');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE address DROP full_address');
+        $this->addSql('CREATE INDEX idx_7049f4507be036fc ON bovin_shipment (shipment_id)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
+        $this->addSql('ALTER INDEX idx_7cd55417be036fc RENAME TO idx_weight_shipment');
+    }
+}

migrations/Version20260218144828.php

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260218144828 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4502ee48a36');
-        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4507be036fc');
-        $this->addSql('DROP TABLE bovin_shipment');
-        $this->addSql('ALTER TABLE shipment ADD nb_bovin_send INT NOT NULL');
-        $this->addSql('ALTER TABLE shipment ADD shipment_type_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC2EE48A36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE');
-        $this->addSql('CREATE INDEX IDX_2CB20DC2EE48A36 ON shipment (shipment_type_id)');
-        $this->addSql('DROP INDEX uniq_weight_shipment_type');
-        $this->addSql('DROP INDEX uniq_weight_reception_type');
-        $this->addSql('ALTER INDEX idx_weight_shipment RENAME TO IDX_7CD55417BE036FC');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, shipment_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX idx_7049f4507be036fc ON bovin_shipment (shipment_id)');
-        $this->addSql('CREATE INDEX idx_7049f4502ee48a36 ON bovin_shipment (shipment_type_id)');
-        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
-        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4502ee48a36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4507be036fc FOREIGN KEY (shipment_id) REFERENCES shipment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC2EE48A36');
-        $this->addSql('DROP INDEX IDX_2CB20DC2EE48A36');
-        $this->addSql('ALTER TABLE shipment DROP nb_bovin_send');
-        $this->addSql('ALTER TABLE shipment DROP shipment_type_id');
-        $this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
-        $this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
-        $this->addSql('ALTER INDEX idx_7cd55417be036fc RENAME TO idx_weight_shipment');
-    }
-}

src/Entity/Address.php

@@ -16,6 +16,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'address')]
+#[ORM\HasLifecycleCallbacks]
 #[ApiResource(
     operations: [
         new Get(
@@ -66,6 +67,10 @@ class Address
     #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read', 'address:write'])]
     private string $city = '';
 
+    #[ORM\Column(length: 400)]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read', 'address:write'])]
+    private string $fullAddress = '';
+
     #[ORM\Column(name: 'country_code', length: 2)]
     #[Groups(['address:read', 'supplier:read', 'customer:read', 'address:write'])]
     private string $countryCode = '';
@@ -165,16 +170,21 @@ class Address
         return $this;
     }
 
-    #[Groups(['address:read', 'supplier:read', 'reception:read', 'shipment:read', 'customer:read'])]
     public function getFullAddress(): string
     {
-        $parts = array_filter([
-            $this->street,
-            $this->street2,
-            trim(sprintf('%s %s', $this->postalCode, $this->city)),
-        ]);
+        return $this->fullAddress;
+    }
 
-        return implode(', ', $parts);
+    #[ORM\PrePersist]
+    #[ORM\PreUpdate]
+    public function updateFullAddress(): void
+    {
+        $this->fullAddress = trim(sprintf(
+            '%s %s %s',
+            $this->street ?? '',
+            $this->postalCode ?? '',
+            $this->city ?? ''
+        ));
     }
 
     /**

src/Entity/BovinShipment.php

@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
+use ApiPlatform\Metadata\ApiFilter;
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Delete;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ORM\Entity]
+#[ApiFilter(SearchFilter::class, properties: ['shipment' => 'exact'])]
+#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment_one_type', columns: ['shipment_id'])]
+#[ORM\Table(name: 'bovin_shipment')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+        ),
+
+        new Post(
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+            denormalizationContext: ['groups' => ['shipment-bovine:write']],
+        ),
+        new Patch(
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+            denormalizationContext: ['groups' => ['shipment-bovine:write']],
+        ),
+        new Delete(),
+    ],
+    security: "is_granted('ROLE_USER')",
+)]
+class BovinShipment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment-bovine:read'])]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(inversedBy: 'bovinShipments')]
+    #[Groups(['shipment-bovine:read', 'shipment-bovine:write'])]
+    #[ApiProperty(readableLink: true)]
+    private ?Shipment $shipment = null;
+
+    #[ORM\ManyToOne]
+    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
+    #[ApiProperty(readableLink: true)]
+    private ?ShipmentType $shipmentType = null;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
+    private ?int $nbBovinSend = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getShipment(): ?Shipment
+    {
+        return $this->shipment;
+    }
+
+    public function setShipment(?Shipment $shipment): void
+    {
+        $this->shipment = $shipment;
+    }
+
+    public function getShipmentType(): ?ShipmentType
+    {
+        return $this->shipmentType;
+    }
+
+    public function setShipmentType(?ShipmentType $shipmentType): void
+    {
+        $this->shipmentType = $shipmentType;
+    }
+
+    public function getNbBovinSend(): ?int
+    {
+        return $this->nbBovinSend;
+    }
+
+    public function setNbBovinSend(?int $nbBovinSend): void
+    {
+        $this->nbBovinSend = $nbBovinSend;
+    }
+}

src/Entity/Customer.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
+use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
+use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
@@ -17,6 +19,9 @@ use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'customer')]
+#[ApiFilter(SearchFilter::class, properties: [
+    'name' => 'ipartial',
+])]
 #[ApiResource(
     operations: [
         new Get(

src/Entity/Reception.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace App\Entity;
 
 use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
+use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
+use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
@@ -29,6 +31,15 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 #[ORM\HasLifecycleCallbacks]
 #[ORM\Table(name: 'reception')]
 #[ApiFilter(BooleanFilter::class, properties: ['isValid'])]
+#[ApiFilter(SearchFilter::class, properties: [
+    'identificationNumber' => 'ipartial',
+    'supplier.name'        => 'ipartial',
+    'carrier.name'         => 'ipartial',
+    'licensePlate'         => 'ipartial',
+    'receptionType.label'  => 'ipartial',
+    'address.fullAddress'  => 'ipartial',
+])]
+#[ApiFilter(DateFilter::class, properties: ['receptionDate'])]
 #[ApiResource(
     operations: [
         new Get(

src/Entity/Shipment.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace App\Entity;
 
 use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
+use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
+use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
@@ -29,6 +31,15 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 #[ORM\HasLifecycleCallbacks]
 #[ORM\Table(name: 'shipment')]
 #[ApiFilter(BooleanFilter::class, properties: ['isValid'])]
+#[ApiFilter(SearchFilter::class, properties: [
+    'identificationNumber' => 'ipartial',
+    'customer.name'        => 'ipartial',
+    'carrier.name'         => 'ipartial',
+    'licencePlate'         => 'ipartial',
+    'bovinShipments'       => 'ipartial',
+    'address.fullAddress'  => 'ipartial',
+])]
+#[ApiFilter(DateFilter::class, properties: ['receptionDate'])]
 #[ApiResource(
     operations: [
         new Get(
@@ -123,15 +134,17 @@ class Shipment
     #[ApiProperty(readableLink: true)]
     private ?Customer $customer = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipments')]
-    #[ORM\JoinColumn(nullable: true)]
+    /**
+     * @var Collection<int, BovinShipment>
+     */
+    #[ORM\OneToMany(
+        targetEntity: BovinShipment::class,
+        mappedBy: 'shipment',
+        cascade: ['persist', 'remove'],
+        orphanRemoval: true
+    )]
     #[Groups(['shipment:read', 'shipment:write'])]
-    #[ApiProperty(readableLink: true)]
-    private ?ShipmentType $shipmentType = null;
-
-    #[ORM\Column]
-    #[Groups(['shipment:read', 'shipment:write'])]
-    private int $nbBovinSend = 0;
+    private Collection $bovinShipments;
 
     /**
      * @var Collection<int, Weight>
@@ -154,7 +167,8 @@ class Shipment
 
     public function __construct()
     {
-        $this->weights = new ArrayCollection();
+        $this->bovinShipments = new ArrayCollection();
+        $this->weights        = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -192,26 +206,6 @@ class Shipment
         $this->currentStep = $currentStep;
     }
 
-    public function getShipmentType(): ?ShipmentType
-    {
-        return $this->shipmentType;
-    }
-
-    public function setShipmentType(?ShipmentType $shipmentType): void
-    {
-        $this->shipmentType = $shipmentType;
-    }
-
-    public function getNbBovinSend(): int
-    {
-        return $this->nbBovinSend;
-    }
-
-    public function setNbBovinSend(int $nbBovinSend): void
-    {
-        $this->nbBovinSend = $nbBovinSend;
-    }
-
     public function getIsValid(): ?bool
     {
         return $this->isValid;
@@ -278,6 +272,37 @@ class Shipment
         $this->customer = $customer;
     }
 
+    public function getBovinShipments(): Collection
+    {
+        return $this->bovinShipments;
+    }
+
+    public function setBovinShipments(Collection $bovinShipments): void
+    {
+        $this->bovinShipments = $bovinShipments;
+    }
+
+    public function addBovinShipment(BovinShipment $bovinShipment): self
+    {
+        if (!$this->bovinShipments->contains($bovinShipment)) {
+            $this->bovinShipments->add($bovinShipment);
+            $bovinShipment->setShipment($this);
+        }
+
+        return $this;
+    }
+
+    public function removeBovinShipment(BovinShipment $bovinShipment): self
+    {
+        if ($this->bovinShipments->removeElement($bovinShipment)) {
+            if ($bovinShipment->getShipment() === $this) {
+                $bovinShipment->setShipment(null);
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * @return Collection<int, Weight>
      */

src/Entity/ShipmentType.php

@@ -7,8 +7,6 @@ namespace App\Entity;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -42,14 +40,6 @@ class ShipmentType
     #[Groups(['shipment-type:read', 'shipment:read'])]
     private ?string $code = null;
 
-    #[ORM\OneToMany(mappedBy: 'shipmentType', targetEntity: Shipment::class)]
-    private Collection $shipments;
-
-    public function __construct()
-    {
-        $this->shipments = new ArrayCollection();
-    }
-
     public function getId(): ?int
     {
         return $this->id;

src/Entity/Supplier.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
+use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
+use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
@@ -17,6 +19,9 @@ use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'supplier')]
+#[ApiFilter(SearchFilter::class, properties: [
+    'name' => 'ipartial',
+])]
 #[ApiResource(
     operations: [
         new Get(

templates/shipment_voucher.html.twig

@@ -250,11 +250,13 @@
             <td>
                 <strong>Bovin</strong><br><br>
                 <div class="bigtable-notes">
-                    {% if shipment.shipmentType %}
-                        <p>
-                            {{ shipment.shipmentType.label ?? '-' }} :
-                            {{ shipment.nbBovinSend ?? 0 }}
-                        </p>
+                    {% if shipment.bovinShipments is not empty %}
+                        {% for entry in shipment.bovinShipments %}
+                            <p>
+                                {{ entry.shipmentType ? entry.shipmentType.label : '-' }} :
+                                {{ entry.nbBovinSend ?? 0 }}
+                            </p>
+                        {% endfor %}
                     {% else %}
                         <p>-</p>
                     {% endif %}