fix : corrections de tous les retours

frontend/components/card-link.vue

@@ -2,9 +2,9 @@
 
 <template>
     <NuxtLink :to="link">
-        <div class="w-[324px] h-[228px] border border-black rounded-md p-6 flex flex-col justify-between">
+        <div class="w-[324px] h-[228px] border border-black rounded-lg p-6 flex flex-col justify-between">
             <div class="flex justify-between">
-                <div class="rounded-full w-[80px] h-[80px] bg-neutral-400 flex justify-center items-center">
+                <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
                     <Icon :name="iconName" style="color: black" size="44" />
                 </div>
                 <div>

frontend/components/reception/reception-bovine-received.vue

@@ -2,7 +2,7 @@
     <div
         v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
         class="flex flex-col items-center gap-16">
-        <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
+        <h1 class="text-4xl uppercase font-bold">Sélection des races réceptionnées</h1>
         <div
             class="flex flex-row gap-8 items-center">
             <div
@@ -10,6 +10,7 @@
                 :key="type.id"
                 class="mt-8 flex flex-row mb-2 gap-6">
                 <UiNumberInput
+                    :id="type.id"
                     :label="type.label"
                     :code="type.code"
                     v-model="bovineQuantities[String(type.id)]"
@@ -77,14 +78,14 @@ onMounted(async () => {
 })
 
 watch(
-    () => receptionId.value,
-    async (id) => {
-        if (!id || !receptionIri.value) {
+    [() => receptionId.value, () => bovineType.value],
+    async ([id, types]) => {
+        if (!id || !receptionIri.value || types.length === 0) {
             return
         }
 
         const selectionMap: Record<string, number | null> = {}
-        for (const type of bovineType.value) {
+        for (const type of types) {
             selectionMap[String(type.id)] = 0
         }
 

frontend/components/reception/reception-form.vue

@@ -91,6 +91,7 @@
                     label: driver.name
                 }))"
                 :loading="isLoadingDrivers"
+                v-if="isLiotCarrier"
                 wrapper-class="col-start-2 row-start-4"
             />
             <!--    Plaque d'immatriculation       -->

frontend/components/reception/reception-product-received.vue

@@ -26,7 +26,7 @@
 
             <div
                 v-if="selectedMerchandiseTypeId && !isGranule"
-                class="flex gap-4 w-[550px] justify-evenly"
+                class="flex gap-4 w-[550px] justify-between"
             >
                 <div
                     v-for="building in buildings"
@@ -51,13 +51,13 @@
                         <div
                             v-for="building in buildings"
                             :key="building.id"
-                            class="flex items-center gap-2 text-lg"
+                            class="flex items-center gap-2 text-lg pl-[2px]"
                         >
                             <UiCheckbox
                                 v-model="selectedPelletBuildingIds[String(type.id)]"
                                 :value="String(building.id)"
                                 :label="building.label"
-                                label-class="text-lg"
+                                label-class="text-xl"
                             />
                         </div>
                     </div>

frontend/components/reception/update-bovin.vue

@@ -83,14 +83,14 @@ onMounted(async () => {
 })
 
 watch(
-    () => receptionId,
-    async (id) => {
-        if (!id || !receptionIri.value) {
+    [() => receptionId, () => bovineType.value],
+    async ([id, types]) => {
+        if (!id || !receptionIri.value || types.length === 0) {
             return
         }
 
         const selectionMap: Record<string, number | null> = {}
-        for (const type of bovineType.value) {
+        for (const type of types) {
             selectionMap[String(type.id)] = 0
         }
 
@@ -105,7 +105,7 @@ watch(
         }
         Object.assign(bovineQuantities, selectionMap)
 
-        const existingOther = await reception.bovineDetail
+        const existingOther = reception.bovineDetail
         const parsedOther =
             typeof existingOther === 'string' && existingOther.trim() !== ''
                 ? Number(existingOther)

frontend/components/reception/update-weight.vue

@@ -1,9 +1,10 @@
 <template>
     <form @submit.prevent="validate">
         <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-8">
-            <UiTextInput
+            <UiNumberInput
                 label="Dsd"
                 class="col-start-2"
+                labelClass="font-bold uppercase"
                 v-model="sharedWeightMeta.dsd"
                 :disabled="!auth.isAdmin"
             />
@@ -19,9 +20,12 @@
                 :key="weight.type"
                 :label="getWeightLabel(weight.type)"
                 labelClass="font-bold uppercase text-xl"
+                inputClass="w-24"
                 v-model="weight.weight"
                 :wrapper-class="weight.type === 'tare' ? 'col-start-1 row-start-1' : 'col-start-2 row-start-1'"
                 :disabled="!auth.isAdmin"
+                :min="0"
+                :max="48000"
             />
         </div>
 

frontend/components/shipment/shipment-form.vue

@@ -22,24 +22,27 @@
                 wrapper-class="col-start-1 row-start-3"
             />
             <!--    Type d'expédition        -->
-            <div class="col-start-1 row-start-4">
-                <label class="font-bold uppercase text-xl mb-2">
-                    Type d'expédition
-                </label>
-                <div class="grid grid-cols-2 gap-x-8">
-                    <div
-                        v-for="type in bovineShipment"
-                        :key="type.id"
-                        class="mt-2 flex flex-row gap-6"
-                    >
-                        <UiNumberInput
-                            :label="type.label"
-                            v-model="bovineQuantities[String(type.id)]"
-                            :placeholder="0"
-                            :min="0"
-                            :max="10"
-                        />
-                    </div>
+            <div class="col-start-1 row-start-4 h-[64px]">
+                <div class="flex items-end gap-8">
+                    <UiRadioGroup
+                        id="shipment-type"
+                        name="shipment-type"
+                        label="Type d'expédition"
+                        v-model="selectedShipmentTypeId"
+                        :options="bovineShipment.map((type) => ({
+                            value: String(type.id),
+                            label: type.label
+                        }))"
+                    />
+                    <UiNumberInput
+                        id="shipment-type-quantity"
+                        label="Quantité"
+                        v-model="shipmentQuantity"
+                        :placeholder="0"
+                        :min="0"
+                        :max="1200"
+                        :disabled="!selectedShipmentTypeId"
+                    />
                 </div>
             </div>
             <!--    Client        -->
@@ -97,6 +100,7 @@
                 }))"
                 :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-4"
+                v-if="isLiotCarrier"
             />
             <!-- Plaque d'immatriculation (hors LIOT)        -->
             <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
@@ -177,8 +181,9 @@ const isLoadingDrivers = ref(false)
 const authStore = useAuthStore()
 const shipmentStore = useShipmentStore()
 const router = useRouter()
-const bovineQuantities = ref<Record<string, number | null>>({})
 const bovineShipment = ref<ShipmentTypeData[]>([])
+const selectedShipmentTypeId = ref('')
+const shipmentQuantity = ref<number | null>(0)
 // Transporteur sélectionné dans le formulaire
 const selectedCarrier = computed(() =>
     carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
@@ -328,15 +333,21 @@ watch(
         form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
         form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
         if (!shipment || !shipment.bovinShipments) {
-            bovineQuantities.value = {}
+            selectedShipmentTypeId.value = ''
+            shipmentQuantity.value = 0
         } else {
-            const next: Record<string, number | null> = {}
-            for (const entry of shipment.bovinShipments) {
+            const selectedEntry = shipment.bovinShipments.find((entry) => {
                 const typeId = entry.shipmentType?.id
-                if (!typeId) continue
-                next[String(typeId)] = entry.nbBovinSend ?? null
+                return Boolean(typeId) && Number(entry.nbBovinSend ?? 0) > 0
+            }) ?? shipment.bovinShipments.find((entry) => Boolean(entry.shipmentType?.id))
+
+            if (!selectedEntry?.shipmentType?.id) {
+                selectedShipmentTypeId.value = ''
+                shipmentQuantity.value = 0
+            } else {
+                selectedShipmentTypeId.value = String(selectedEntry.shipmentType.id)
+                shipmentQuantity.value = selectedEntry.nbBovinSend ?? 0
             }
-            bovineQuantities.value = next
         }
         isHydrating.value = false
     },
@@ -464,16 +475,22 @@ watch(
     }
 )
 const buildDesiredBovinShipments = () => {
-    return bovineShipment.value
-        .map((type) => {
-            const raw = bovineQuantities.value[String(type.id)]
-            const quantity = raw === null || raw === undefined ? 0 : Number(raw)
-            return {
-                type,
-                quantity: Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
-            }
-        })
-        .filter((entry) => entry.quantity > 0)
+    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,

frontend/components/shipment/shipment-loading.vue

@@ -0,0 +1,26 @@
+<template>
+    <div class="flex flex-col items-center gap-16">
+        <h1 class="font-bold text-5xl uppercase">Charment des bovins</h1>
+        <div
+            class="w-full flex flex-col items-center justify-center">
+            <UiLoadingDots />
+        </div>
+        <button
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
+            @click="goNext"
+        >Pesée</button>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {useShipmentStore} from "~/stores/shipment";
+
+const shipmentStore = useShipmentStore()
+
+const goNext = async () => {
+    const nextStep = shipmentStore.current.currentStep + 1
+    await shipmentStore.updateShipment(shipmentStore.current.id, {
+        currentStep: nextStep
+    })
+}
+</script>

frontend/components/ui/UiCheckbox.vue

@@ -1,14 +1,14 @@
 <template>
     <div :class="wrapperClass">
         <label
-            class="flex items-center gap-2"
+            class="flex items-center gap-2 cursor-pointer"
             :class="labelClass"
         >
             <input
                 type="checkbox"
                 :checked="checked"
                 :disabled="disabled"
-                :class="inputClass"
+                :class="['cursor-pointer', inputClass]"
                 @change="onChange"
             >
             <span v-if="label">{{ label }}</span>

frontend/components/ui/UiDateInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl mb-2"
+            class="font-bold uppercase text-xl"
             :class="labelClass"
         >
             {{ label }}
@@ -14,7 +14,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl pb-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black justify-self-start text-xl py-[6px] uppercase bg-transparent appearance-none h-[34px]"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-pointer',

frontend/components/ui/UiNumberInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="text-xl flex items-center"
+            class="text-xl flex items-center gap-2"
             :class="labelClass"
         >
             <span
@@ -74,14 +74,41 @@ const emit = defineEmits<{
 const attrs = useAttrs()
 const isEmpty = computed(() => props.modelValue === null || props.modelValue === undefined || props.modelValue === '')
 
+const toNumberOrNull = (value: number | string | undefined) => {
+    if (value === undefined || value === '') {
+        return null
+    }
+    const parsed = Number(value)
+    return Number.isFinite(parsed) ? parsed : null
+}
+
 const onInput = (event: Event) => {
     const target = event.target as HTMLInputElement
     if (target.value === '') {
         emit('update:modelValue', null)
         return
     }
-    const numeric = Math.max(0, Number(target.value))
-    emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
+    const parsed = Number(target.value)
+    if (!Number.isFinite(parsed)) {
+        emit('update:modelValue', null)
+        return
+    }
+
+    const min = toNumberOrNull(props.min)
+    const max = toNumberOrNull(props.max)
+
+    let numeric = parsed
+    if (min !== null) {
+        numeric = Math.max(min, numeric)
+    } else {
+        numeric = Math.max(0, numeric)
+    }
+    if (max !== null) {
+        numeric = Math.min(max, numeric)
+    }
+
+    target.value = String(numeric)
+    emit('update:modelValue', numeric)
 }
 
 const onKeydown = (event: KeyboardEvent) => {

frontend/components/ui/UiRadioGroup.vue

@@ -0,0 +1,93 @@
+<template>
+    <div :class="['flex flex-col', wrapperClass]">
+        <label
+            v-if="label"
+            class="font-bold uppercase text-xl"
+            :class="labelClass"
+        >
+            {{ label }}
+        </label>
+        <div
+            role="radiogroup"
+            :aria-label="label || id || 'radio-group'"
+            :class="['flex items-center gap-6 mt-1', groupClass]"
+        >
+            <label
+                v-for="option in options"
+                :key="String(option.value)"
+                :for="`${id || 'radio'}-${option.value}`"
+                class="flex items-center gap-2"
+                :class="itemClass"
+            >
+                <input
+                    :id="`${id || 'radio'}-${option.value}`"
+                    type="radio"
+                    :name="name || id || 'radio-group'"
+                    :value="String(option.value)"
+                    :checked="String(modelValue ?? '') === String(option.value)"
+                    :disabled="disabled"
+                    v-bind="attrs"
+                    class="h-4 w-4 border-slate-300 text-primary-500 focus:ring-primary-500"
+                    :class="[
+                        disabled ? 'cursor-not-allowed' : 'cursor-pointer',
+                        inputClass
+                    ]"
+                    @change="onChange"
+                >
+                <span class="text-xl" :class="optionLabelClass">
+                    {{ option.label }}
+                </span>
+            </label>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { useAttrs } from 'vue'
+
+type RadioOption = {
+    value: string | number
+    label: string
+}
+
+defineOptions({ inheritAttrs: false })
+
+const props = withDefaults(
+    defineProps<{
+        id?: string
+        name?: string
+        label?: string
+        modelValue: string | number | null | undefined
+        options: RadioOption[]
+        disabled?: boolean
+        wrapperClass?: string
+        labelClass?: string
+        groupClass?: string
+        itemClass?: string
+        inputClass?: string
+        optionLabelClass?: string
+    }>(),
+    {
+        name: '',
+        label: '',
+        disabled: false,
+        wrapperClass: '',
+        labelClass: '',
+        groupClass: '',
+        itemClass: '',
+        inputClass: '',
+        optionLabelClass: ''
+    }
+)
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: string): void
+}>()
+
+const attrs = useAttrs()
+
+const onChange = (event: Event) => {
+    const target = event.target as HTMLInputElement
+    emit('update:modelValue', target.value)
+}
+</script>

frontend/components/ui/UiSelect.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl mb-2"
+            class="font-bold uppercase text-xl"
             :class="labelClass"
         >
             {{ label }}
@@ -13,7 +13,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled || loading"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl pb-[6px] bg-transparent"
+            class="border-b border-black justify-self-start text-xl py-[6px] bg-transparent"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',

frontend/components/ui/UiTextInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl mb-2"
+            class="font-bold uppercase text-xl"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
             :maxlength="maxlength"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl pb-[6px] bg-transparent"
+            class="border-b border-black text-xl py-[6px] bg-transparent"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',

frontend/components/ui/license-plate-input.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col">
-    <label :for="inputId" class="font-bold uppercase text-xl mb-2">{{ label }}</label>
+    <label :for="inputId" class="font-bold uppercase text-xl">{{ label }}</label>
       <div class="flex items-end gap-8">
           <input
               :id="inputId"

frontend/constants/steps.ts

@@ -1,9 +1,10 @@
 export enum StepLabel {
     Reception = 'Réception',
     GrossWeighing = 'Pesée à plein',
-    Selection = 'Sélection réceptionnées',
+    Selection = 'Sélection réception',
     TareWeighing = 'Pesée à vide',
     Shipment = 'Expédition',
+    ShipmentLoading = 'Chargement',
 }
 
 export const RECEPTION_STEP_LABELS = [
@@ -16,5 +17,6 @@ export const RECEPTION_STEP_LABELS = [
 export const SHIPMENT_STEP_LABELS = [
     StepLabel.Shipment,
     StepLabel.TareWeighing,
+    StepLabel.ShipmentLoading,
     StepLabel.GrossWeighing,
 ]

frontend/layouts/admin.vue

@@ -60,8 +60,14 @@
                             Utilisateurs
                         </a>
                     </NuxtLink>
-                    <NuxtLink to="/admin/customer/customer-list">
-                        Client
+                    <NuxtLink to="/admin/customer/customer-list" custom v-slot="{ href, navigate }">
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/customer') ? 'opacity-100' : 'opacity-50'"
+                        >
+                            Clients
+                        </a>
                     </NuxtLink>
                 </div>
 

frontend/layouts/default.vue

@@ -104,7 +104,7 @@
         <main class="mx-auto w-full max-w-[1280px]">
             <slot/>
         </main>
-        <footer class="w-full mt-8 bg-primary-500 p-6">
+        <footer class="w-full mt-8 bg-primary-500 px-6 py-3">
             <p class="font-bold text-white text-right">v{{ version }}</p>
         </footer>
     </div>

frontend/pages/admin/user/list.vue

@@ -28,7 +28,7 @@
                     {{ user.username }}
                 </div>
                 <div>
-                    {{ user.roles?.join(', ') || ' ---' }}
+                    {{ getRoleLabels(user.roles) }}
                 </div>
             </div>
         </div>
@@ -42,15 +42,27 @@ definePageMeta({
 })
 
 import type {UserData} from "~/services/dto/user-data";
-import {getAdminUsers, getUsers} from "~/services/auth";
+import {getAdminUsers} from "~/services/auth";
+import {ROLE} from "~/utils/constants";
 
 const userList = ref<UserData[]>([])
 const router = useRouter()
+const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))
 
 const goToUser = (id: number) => {
     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()
 })

frontend/pages/index.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
 </script>
 <template>
-    <div class="flex flex-wrap justify-center mt-8 gap-8 mb-8 md:mb-0">
+    <div class="flex flex-wrap justify-center mt-8 gap-12 mb-8 md:mb-0">
         <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="mdi:warehouse" />
+        <card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
         <card-link label="RÉCEPTIONS EN ATTENTE" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline" />
         <card-link label="EXPÉDITIONS EN ATTENTE" link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container" />
-        <card-link label="CASES" link="/" iconName="mdi:cube-outline" />
+        <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 label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />

frontend/pages/reception/[[id]].vue

@@ -1,29 +1,28 @@
 <template>
-    <div>
-        <div class="flex justify-between h-[52px] mt-6 mb-[80px]">
-            <div class="flex flex-1 mr-16">
-                <UiStepper
-                    :labels="RECEPTION_STEP_LABELS"
-                    :current-step="storeReception?.currentStep ?? 0"
-                    @select="handleStepSelect"
-                />
-            </div>
-            <button
-                type="button"
-                class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
-                @click="saveAndHold"
-            >Mettre en attente</button>
+    <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
+        <div class="flex flex-1 mr-16">
+            <UiStepper
+                :labels="RECEPTION_STEP_LABELS"
+                :current-step="storeReception?.currentStep ?? 0"
+                @select="handleStepSelect"
+            />
         </div>
-        <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
-        <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
-        <ReceptionProductReceived
-            v-if="storeReception?.currentStep === 2 &&
-            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
-        <ReceptionBovineReceived
-            v-if="storeReception?.currentStep === 2 &&
-            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
-        <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
+        <button
+            type="button"
+            class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
+            @click="saveAndHold"
+        >Mettre en attente
+        </button>
     </div>
+    <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
+    <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
+    <ReceptionProductReceived
+        v-if="storeReception?.currentStep === 2 &&
+            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
+    <ReceptionBovineReceived
+        v-if="storeReception?.currentStep === 2 &&
+            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
+    <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
 </template>
 
 <script setup lang="ts">

frontend/pages/reception/finish-reception.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="flex items-center justify-start gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
+    <div class="flex items-center justify-start gap-10 mt-16">
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
             <h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
     </div>
 
-    <div class="ps-20 " >
+    <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>
@@ -27,7 +27,7 @@
                 <div>{{ reception.supplier?.name }}</div>
                 <div>{{ reception.address?.fullAddress }}</div>
                 <div>{{ reception.receptionType?.label }}</div>
-                <div>{{ formatWeighing(reception, 'gross') }} | {{ formatWeighing(reception, 'tare') }}</div>
+                <div>Plein : {{ formatWeighing(reception, 'gross') }} <br> Vide : {{ formatWeighing(reception, 'tare') }}</div>
             </div>
         </div>
     </div>

frontend/pages/reception/waiting-reception.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="flex items-center justify-between ">
+    <div class="flex items-center justify-between mt-16">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
             <h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
         </div>
     </div>
 
-    <div class="ps-20 " >
+    <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>

frontend/pages/shipment/[[id]].vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex justify-between h-[52px] mt-6 mb-[80px]">
+        <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
                     :labels="SHIPMENT_STEP_LABELS"
@@ -18,7 +18,8 @@
         </div>
         <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
         <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>
-        <ShipmentWeight v-if="storeShipment?.currentStep >= 2" mode="tare"/>
+        <ShipmentLoading v-if="storeShipment?.currentStep === 2"/>
+        <ShipmentWeight v-if="storeShipment?.currentStep === 3" mode="tare"/>
 
     </div>
 </template>

frontend/pages/shipment/finish-shipment.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="flex items-center justify-start gap-10">
-        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
+    <div class="flex items-center justify-start gap-10 mt-16">
+        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
         <h1 class="text-3xl font-bold uppercase">listes des expéditions finie</h1>
     </div>
 
-    <div class="ps-20 ">
+    <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>
@@ -21,11 +21,11 @@
                 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="goToshipment(shipment.id)"
+                @click="goShipment(shipment.id)"
             >
                 <div>{{ shipment.identificationNumber }}</div>
                 <div>{{ shipment.shipmentDate }}</div>
-                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.customer?.name }}</div>
                 <div>{{ shipment.address?.fullAddress }}</div>
                 <div>
                     <template v-if="formatBovinShipmentLines(shipment).length">
@@ -38,7 +38,7 @@
                         </div>
                     </template>
                 </div>
-                <div>{{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }}</div>
+                <div>Vide : {{ formatWeighing(shipment, 'tare') }} <br>  Plein :{{ formatWeighing(shipment, 'gross') }}</div>
             </div>
         </div>
     </div>
@@ -71,8 +71,8 @@ const formatBovinShipmentLines = (shipment: ShipmentData) => {
     })
 }
 
-const goToshipment = (id: number) => {
-    //router.push(`/shipment/update/${id}`)
+const goShipment = (id: number) => {
+    router.push(`/shipment/update/${id}`)
 }
 
 onMounted(async () => {

frontend/pages/shipment/waiting-shipment.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="flex items-center justify-between ">
+    <div class="flex items-center justify-between mt-16">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
             <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
         </div>
     </div>
 
-    <div class="ps-20 ">
+    <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>

frontend/services/dto/address-data.ts

@@ -6,6 +6,7 @@ export interface AddressData {
     postalCode: string
     city: string
     countryCode: string
+    fullAddress: string
 }
 
 export interface AddressFormData {