feat : ajout d'une page de creation d'une expedition

2026-02-11 16:12:33 +01:00
parent 0181d72144
commit 5f4139fde3
31 changed files with 1292 additions and 356 deletions
--- a/frontend/components/reception/reception-form.vue
+++ b/frontend/components/reception/reception-form.vue
@@ -142,7 +142,7 @@ import type {DriverData} from '~/services/dto/driver-data'
 import {getDriverList} from '~/services/driver'
 import type {VehicleData} from '~/services/dto/vehicle-data'
 import {getVehicleList} from '~/services/vehicle'
-import {RECEPTION_TYPE_CODES, SUPLLIER_CODE} from "~/utils/constants";
+import {RECEPTION_TYPE_CODES, SUPPLIER_CODE} from "~/utils/constants";
 import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
 import type {ReceptionFormData} from "~/services/dto/reception-data";

@@ -183,7 +183,7 @@ const selectedCarrier = computed(() =>
    carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
 )
 // Indique si le transporteur est LIOT
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
+const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
 // Adresses disponibles pour le fournisseur sélectionné
 const supplierAddresses = computed(() => {
    const supplierId = Number(form.supplierId)
--- a/frontend/components/reception/reception-weight.vue
+++ b/frontend/components/reception/reception-weight.vue
@@ -74,7 +74,9 @@ const printReceipt = async () => {
    }

    await saveWeight()
-    await printPdf(`/receptions/${receptionStore.current.id}/receipt`)
+    const reception = receptionStore.current
+    const filename = `${reception.identificationNumber ?? reception.id}_${reception.supplier?.name ?? 'fournisseur'}_${reception.licensePlate ?? 'immat'}.pdf`
+    await printPdf(`/receptions/${reception.id}/receipt`, filename)

    // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
    await new Promise((resolve) => setTimeout(resolve, 600))
--- a/frontend/components/shipment/shipment-form.vue
+++ b/frontend/components/shipment/shipment-form.vue
@@ -1,10 +1,12 @@
 <template>
    <form @submit.prevent="validate">
        <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
-            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Éxpedition</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Expédition</h1>
+            <!--    Nom de l'utilisateur       -->
            <UiSelect
                id="shipment-user"
-                label="Nom de l'utisateur"
+                v-model="form.userId"
+                label="Nom de l'utilisateur"
                :options="users.map((user) => ({
                    value: String(user.id),
                    label: user.username
@@ -12,14 +14,14 @@
                :loading="isLoadingUsers"
                wrapper-class="col-start-1 row-start-2"
            />
-
+            <!--    Date de l'éxpedition        -->
            <UiDateInput
                id="shipment-date"
                v-model="form.shipmentDate"
                label="Date du jour"
                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 block">
                    Type d'expédition
@@ -40,10 +42,9 @@
                    </div>
                </div>
            </div>
-
-
+            <!--    Client        -->
            <UiSelect
-                id="reception-driver"
+                id="shipment-customer"
                v-model="form.customerId"
                label="Client"
                :options="customers.map((customer) => ({
@@ -53,21 +54,18 @@
                :loading="isLoadingCustomers"
                wrapper-class="col-start-1 row-start-5"
            />
-
+            <!--    Adresse du client        -->
            <UiSelect
-                id="reception-driver"
+                id="shipment-address"
                v-model="form.addressId"
-                :options="customerAddresses.map((address) => ({
-                    value: String(address.id),
-                    label: address.fullAddress
-                }))"
+                :options="customerAddressOptions"
                :disabled="isLoadingCustomers || customerAddresses.length === 0"
                label="Adresse"
                wrapper-class="col-start-2 row-start-1"
            />
-
+            <!--   Camion        -->
            <UiSelect
-                id="reception-driver"
+                id="shipment-truck"
                v-model="form.truckId"
                label="Camion"
                :options="trucks.map((truck) => ({
@@ -77,9 +75,9 @@
                :loading="isLoadingTrucks"
                wrapper-class="col-start-2 row-start-2"
            />
-
+            <!--   Transporteur        -->
            <UiSelect
-                id="reception-driver"
+                id="shipment-carrier"
                v-model="form.carrierId"
                label="Transporteur"
                :options="carriers.map((carrier) => ({
@@ -88,9 +86,9 @@
                }))"
                wrapper-class="col-start-2 row-start-3"
            />
-
+            <!--  Chauffeur (LIOT)        -->
            <UiSelect
-                id="reception-driver"
+                id="shipment-driver"
                v-model="form.driverId"
                label="Nom du chauffeur si LIOT"
                :options="filteredDrivers.map((driver) => ({
@@ -100,7 +98,7 @@
                :loading="isLoadingDrivers"
                wrapper-class="col-start-2 row-start-4"
            />
-
+            <!-- Plaque d'immatriculation (hors LIOT)        -->
            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
                <UiLicensePlateInput
                    v-model="form.licencePlate"
@@ -110,7 +108,7 @@
            <!--    Immatriculation (LIOT)        -->
            <UiSelect
                v-if="isLiotCarrier"
-                id="reception-vehicle"
+                id="shipment-vehicle"
                v-model="form.vehicleId"
                label="Immatriculation"
                :options="filteredVehicles.map((vehicle) => ({
@@ -139,6 +137,7 @@ import type {TruckData} from '~/services/dto/truck-data'
 import type {CarrierData} from '~/services/dto/carrier-data'
 import type {DriverData} from '~/services/dto/driver-data'
 import type {VehicleData} from '~/services/dto/vehicle-data'
+import type {AddressData} from '~/services/dto/address-data'
 import {getUsers} from '~/services/auth'
 import {getCustomerList} from '~/services/customer'
 import {getTruckList} from '~/services/truck'
@@ -146,10 +145,10 @@ import {getCarrierList} from '~/services/carrier'
 import {getVehicleList} from '~/services/vehicle'
 import {getDriverList} from '~/services/driver'
 import type {ShipmentFormData} from '~/services/dto/shipment-data'
-import {SUPLLIER_CODE} from "~/utils/constants"
+import {SUPPLIER_CODE} from "~/utils/constants"
 import {useAuthStore} from '~/stores/auth'
 import {useShipmentStore} from '~/stores/shipment'
-import {ref} 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 {
@@ -167,6 +166,7 @@ const drivers = ref<DriverData[]>([])
 const vehicles = ref<VehicleData[]>([])

 const isLoadingUsers = ref(false)
+const isLoadingShipmentTypes = ref(false)
 const isLoadingCustomers = ref(false)
 const isLoadingTrucks = ref(false)
 const isLoadingCarriers = ref(false)
@@ -183,8 +183,7 @@ const bovineShipment = ref<ShipmentTypeData[]>([])
 const selectedCarrier = computed(() =>
    carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
 )
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
-
+const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)

 const form = reactive<ShipmentFormData>({
    userId: '',
@@ -197,22 +196,30 @@ const form = reactive<ShipmentFormData>({
    vehicleId: '',
    licencePlate: '',
 })
-
-const customerAddresses = computed(() => {
+// Adresses liées au client sélectionné
+const customerAddresses = computed<AddressData[]>(() => {
    const customerId = Number(form.customerId)
    if (!Number.isFinite(customerId)) {
        return []
    }
    return customers.value.find((customer) => customer.id === customerId)?.addresses ?? []
 })
-
+// Options pour le select des adresses du client
+const customerAddressOptions = computed(() =>
+    customerAddresses.value
+        .map((address) => ({
+            value: String(address.id),
+            label: address.fullAddress
+        }))
+)
+// Chauffeurs liés au transporteur sélectionné (LIOT)
 const filteredDrivers = computed<DriverData[]>(() => {
    if (!form.carrierId) {
        return []
    }
    return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
 })
-
+// Véhicules liés au transporteur + camion sélectionnés (LIOT)
 const filteredVehicles = computed<VehicleData[]>(() => {
    if (!form.carrierId) {
        return []
@@ -223,8 +230,7 @@ const filteredVehicles = computed<VehicleData[]>(() => {
            (!form.truckId || String(vehicle.truck?.id) === form.truckId)
    )
 })
-
-
+// Chargement des données pour les selects
 const loadUsers = async () => {
    isLoadingUsers.value = true
    try {
@@ -235,11 +241,11 @@ const loadUsers = async () => {
 }

 const loadShipmentType = async () => {
-    isLoadingUsers.value = true
+    isLoadingShipmentTypes.value = true
    try {
        bovineShipment.value = await getShipmentTypeList()
    } finally {
-        isLoadingUsers.value = false
+        isLoadingShipmentTypes.value = false
    }
 }

@@ -252,7 +258,6 @@ const loadCustomers = async () => {
    }

 }
-
 const loadTrucks = async () => {
    isLoadingTrucks.value = true
    try {
@@ -261,7 +266,6 @@ const loadTrucks = async () => {
        isLoadingTrucks.value = false
    }
 }
-
 const loadCarriers = async () => {
    isLoadingCarriers.value = true
    try {
@@ -270,7 +274,6 @@ const loadCarriers = async () => {
        isLoadingCarriers.value = false
    }
 }
-
 const loadVehicles = async () => {
    isLoadingVehicles.value = true
    try {
@@ -279,7 +282,6 @@ const loadVehicles = async () => {
        isLoadingVehicles.value = false
    }
 }
-
 const loadDrivers = async () => {
    isLoadingDrivers.value = true
    try {
@@ -288,8 +290,6 @@ const loadDrivers = async () => {
        isLoadingDrivers.value = false
    }
 }
-
-
 // On met le user connecté par défaut dans le select
 const setDefaultUser = () => {
    if (form.userId) {
@@ -299,7 +299,7 @@ const setDefaultUser = () => {
        form.userId = String(authStore.user.id)
    }
 }
-
+// Chargement initial des données
 onMounted(async () => {
    await loadShipmentType()
    await loadUsers()
@@ -311,27 +311,37 @@ onMounted(async () => {
    await authStore.ensureSession()
    setDefaultUser()
 })
-
+// Hydrate le formulaire depuis l'expédition en cours
 watch(
    () => shipmentStore.current,
    (shipment) => {
+        isHydrating.value = true
+        form.licencePlate = shipment?.licencePlate ?? ''
+        form.shipmentDate = shipment?.shipmentDate ?? new Date().toISOString().slice(0, 10)
+        form.userId = shipment?.user?.id ? String(shipment.user.id) :
+            form.userId
+        form.customerId = shipment?.customer?.id ?
+            String(shipment.customer.id) : ''
+        form.addressId = shipment?.address?.id ? String(shipment.address.id) : ''
+        form.truckId = shipment?.truck?.id ? String(shipment.truck.id) : ''
+        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) {
            bovineQuantities.value = {}
-            return
-        }
-        const next: Record<string, number | null> = {}
-        for (const entry of shipment.bovinShipments) {
-            const typeId = entry.shipmentType?.id
-            if (!typeId) {
-                continue
+        } else {
+            const next: Record<string, number | null> = {}
+            for (const entry of shipment.bovinShipments) {
+                const typeId = entry.shipmentType?.id
+                if (!typeId) continue
+                next[String(typeId)] = entry.nbBovinSend ?? null
            }
-            next[String(typeId)] = entry.nbBovinSend ?? null
+            bovineQuantities.value = next
        }
-        bovineQuantities.value = next
+        isHydrating.value = false
    },
    {immediate: true}
 )
-
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
    () => [form.customerId, customers.value],
@@ -356,34 +366,43 @@ watch(
    },
    {immediate: true}
 )
-
 // Valide/auto-sélectionne le véhicule selon camion + transporteur (LIOT)
+const applyLiotDefaults = () => {
+    if (isHydrating.value) {
+        return
+    }
+    if (!form.carrierId) {
+        form.driverId = ''
+        form.vehicleId = ''
+        return
+    }
+    if (!isLiotCarrier.value) {
+        form.driverId = ''
+        form.vehicleId = ''
+        return
+    }
+    if (filteredDrivers.value.length === 1) {
+        form.driverId = String(filteredDrivers.value[0].id)
+    }
+    if (filteredVehicles.value.length === 1) {
+        form.vehicleId = String(filteredVehicles.value[0].id)
+    }
+}
 watch(
    () => form.carrierId,
    () => {
-        if (isHydrating.value) {
-            return
-        }
-        if (!form.carrierId) {
-            form.driverId = ''
-            form.vehicleId = ''
-            return
-        }
-        if (!isLiotCarrier.value) {
-            form.driverId = ''
-            form.vehicleId = ''
-            return
-        }
-        if (filteredDrivers.value.length === 1) {
-            form.driverId = String(filteredDrivers.value[0].id)
-        }
-        if (filteredVehicles.value.length === 1) {
-            form.vehicleId = String(filteredVehicles.value[0].id)
-        }
+        applyLiotDefaults()
    },
    {immediate: true}
 )
-
+watch(
+    () => isHydrating.value,
+    (value) => {
+        if (!value) {
+            applyLiotDefaults()
+        }
+    }
+)
 // Récupère la plaque depuis le véhicule choisi (LIOT)
 watch(
    () => [form.truckId, form.carrierId, vehicles.value],
@@ -407,7 +426,6 @@ watch(
    },
    {immediate: true}
 )
-
 // Auto-renseigne le véhicule si la plaque correspond (LIOT)
 watch(
    () => [form.vehicleId, form.carrierId, vehicles.value],
@@ -427,7 +445,6 @@ watch(
        }
    }
 )
-
 watch(
    () => [form.licencePlate, form.carrierId, vehicles.value],
    () => {
@@ -442,7 +459,6 @@ watch(
        }
    }
 )
-
 const buildDesiredBovinShipments = () => {
    return bovineShipment.value
        .map((type) => {
@@ -455,17 +471,20 @@ const buildDesiredBovinShipments = () => {
        })
        .filter((entry) => entry.quantity > 0)
 }
-
-const syncBovinShipments = async (shipmentId: number) => {
+const syncBovinShipments = async (
+    shipmentId: number,
+    existing: Array<{ id?: number; nbBovinSend: number | null; shipmentType?: unknown }> = []
+) => {
    const shipmentIri = `/api/shipments/${shipmentId}`
-    const existing = await getBovinShipmentList(shipmentIri)
    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) {
@@ -496,15 +515,15 @@ const syncBovinShipments = async (shipmentId: number) => {
        })
    }
 }
-
-// Valide le formulaire et crée/met à jour l'expédition
-const validate = async () => {
+const buildPayload = () => {
    const normalizedLicensePlate = form.licencePlate.trim()
    const normalizedShipmentDate = form.shipmentDate.trim()
    const normalizedCustomerId = form.customerId.trim()
    const normalizedTruckId = form.truckId.trim()
    const normalizedCarrierId = form.carrierId.trim()
-
+    const normalizedDriverId = form.driverId.trim()
+    const normalizedUserId = form.userId.trim()
+    const normalizedAddressId = form.addressId.trim()
    const customerIri = normalizedCustomerId
        ? `/api/customers/${normalizedCustomerId}`
        : null
@@ -514,31 +533,73 @@ const validate = async () => {
    const carrierIri = normalizedCarrierId
        ? `/api/carriers/${normalizedCarrierId}`
        : null
+    const userIri = normalizedUserId
+        ? `/api/users/${normalizedUserId}`
+        : null
+    const driverIri = normalizedDriverId
+        ? `/api/drivers/${normalizedDriverId}`
+        : null
+    const addressIri = normalizedAddressId
+        ? `/api/addresses/${normalizedAddressId}`
+        : null

-    const payload = {
+    return {
        licencePlate: normalizedLicensePlate,
        shipmentDate: normalizedShipmentDate,
        customer: customerIri,
        truck: truckIri,
-        carrier: carrierIri
+        carrier: carrierIri,
+        driver: driverIri,
+        user: userIri,
+        address: addressIri
    }
+}
+
+const saveDraft = async () => {
+    const payload = buildPayload()
+    if (!shipmentStore.current) {
+        const created = await shipmentStore.createShipment({
+            currentStep: 0,
+            ...payload
+        })
+        if (created) {
+            await syncBovinShipments(created.id, [])
+        }
+        return
+    }
+
+    await shipmentStore.updateShipment(shipmentStore.current.id, {
+        currentStep: shipmentStore.current.currentStep,
+        ...payload
+    })
+    await syncBovinShipments(
+        shipmentStore.current.id,
+        shipmentStore.current?.bovinShipments ?? []
+    )
+}
+
+defineExpose({saveDraft})
+// Valide le formulaire et crée/met à jour l'expédition
+const validate = async () => {
+    const payload = buildPayload()
    if (!shipmentStore.current) {
        const created = await shipmentStore.createShipment({
            currentStep: 1,
            ...payload
        })
        if (created) {
-            await syncBovinShipments(created.id)
+            await shipmentStore.loadShipment(created.id)
+            await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
            await router.push(`/shipment/${created.id}`)
        }
        return
    }
-
    const nextStep = shipmentStore.current.currentStep + 1
    await shipmentStore.updateShipment(shipmentStore.current.id, {
        currentStep: nextStep,
        ...payload
    })
-    await syncBovinShipments(shipmentStore.current.id)
+    await shipmentStore.loadShipment(shipmentStore.current.id)
+    await syncBovinShipments(shipmentStore.current.id, shipmentStore.current?.bovinShipments ?? [])
 }
 </script>
--- a/frontend/components/shipment/shipment-weight.vue
+++ b/frontend/components/shipment/shipment-weight.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="flex justify-center">
+        <div class="flex flex-col items-center w-[660px]">
+            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+<!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
+            <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
+            <div
+                v-if="showLoadingBox"
+                class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
+                    <UiLoadingDots />
+            </div>
+            <div v-else-if="displayWeight !== null" class="w-full">
+                <div
+                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
+                    {{ displayWeight }} kg
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="flex justify-center mt-[54px]">
+        <button
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="fetchWeight"
+        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
+        <button
+            v-if="displayWeight !== null && !showGenerateReceipt"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
+            @click="saveWeight"
+        >Valider la pesée</button>
+        <button
+            v-if="showGenerateReceipt"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
+            @click="printReceipt"
+        >Générer le bon</button>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useWeighingShipment } from '~/composables/useWeighing'
+import { usePdfPrinter } from '~/composables/usePdfPrinter'
+import { useShipmentStore } from '~/stores/shipment'
+
+const props = defineProps<{
+    mode: 'gross' | 'tare'
+}>()
+
+const router = useRouter()
+const shipmentStore = useShipmentStore()
+const { current: storeShipment } = storeToRefs(shipmentStore)
+const { printPdf } = usePdfPrinter()
+const {
+    displayWeight,
+    title,
+    showLoadingBox,
+    fetchWeight,
+    saveWeight
+} = useWeighingShipment({
+    modeShipment: props.mode,
+    shipment: storeShipment,
+    updateShipment: shipmentStore.updateShipment,
+    loadShipment: shipmentStore.loadShipment
+})
+// Affiche le bouton de génération du bon à l'étape tare
+const showGenerateReceipt = computed(
+    () => props.mode === 'tare' && displayWeight.value !== null
+)
+
+// Génère le bon d'expédition, puis clôture l'expédition
+const printReceipt = async () => {
+    if (!import.meta.client || !shipmentStore.current) {
+        return
+    }
+
+    await saveWeight()
+    const shipment = shipmentStore.current
+    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licencePlate ?? 'immat'}.pdf`
+    await printPdf(`/shipments/${shipment.id}/receipt`, filename)
+
+    // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
+    await new Promise((resolve) => setTimeout(resolve, 600))
+
+    const result = await shipmentStore.updateShipment(shipmentStore.current.id, {
+        isValid: true
+    })
+    if (!result) {
+        return
+    }
+
+/*    shipmentStore.clearCurrent()
+    await router.push('/')*/
+}
+
+// Récupère le poids dès l'arrivée sur l'écran
+onMounted(() => {
+    if (displayWeight.value === null) {
+        fetchWeight()
+    }
+})
+</script>
--- a/frontend/components/user/user-form.vue
+++ b/frontend/components/user/user-form.vue
@@ -1,123 +0,0 @@
-<template>
-    <form @submit.prevent="validate">
-        <div
-            class="flex items-center justify-between gap-10">
-            <h1 class="text-3xl font-bold uppercase">
-                {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
-            </h1>
-            <button
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                type="submit"
-            >
-                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
-            </button>
-        </div>
-
-        <div class="grid gap-y-16 gap-x-40 mb-16">
-            <UiTextInput
-                id="user-name"
-                v-model="form.username"
-                label="Nom de l'utilisateur"
-            />
-
-            <UiSelect
-                id="user-role"
-                v-model="form.role"
-                label="Rôle de l'utilisateur"
-                :options="ROLE"
-            />
-            <UiTextInput
-                id="user-password"
-                v-model="form.password"
-                label="Mot de passe"
-                type="password"
-
-            />
-
-        </div>
-    </form>
-</template>
-
-<script setup lang="ts">
-
-import {computed, reactive, ref, watch} from 'vue'
-import {ROLE} from '~/utils/constants'
-import {createUser, updateUser, getUser} from '~/services/auth'
-import type {UserData, UserFormData} from '~/services/dto/user-data'
-
-const route = useRoute()
-const router = useRouter()
-const userId = computed(() => resolveUserId(route.params.id))
-const isLoading = ref(false)
-const isHydrating = ref(false)
-
-const resolveUserId = (param: unknown) => {
-    const idStr = Array.isArray(param) ? param[0] : param
-    if (!idStr) {
-        return null
-    }
-    const id = Number(idStr)
-    return Number.isFinite(id) ? id : null
-}
-
-
-const form = reactive<UserFormData>({
-    username: '',
-    password: '',
-    role: ''
-})
-
-const hydrateFromUser = (user: UserData | null) => {
-    if (!user) {
-        return
-    }
-    isHydrating.value = true
-    form.username = user.username ?? ''
-    const roles = user.roles ?? []
-    const hasAdmin = roles.includes("ROLE_ADMIN")
-    form.role = hasAdmin ? "ROLE_ADMIN" : "ROLE_USER"
-    form.password = ''
-    isHydrating.value = false
-}
-
-watch(
-    () => userId.value,
-    async (id) => {
-        if (id === null) {
-            return
-        }
-        isLoading.value = true
-        try {
-            const user = await getUser(id)
-            hydrateFromUser(user)
-        } finally {
-            isLoading.value = false
-        }
-    },
-    {immediate: true}
-)
-
-async function validate() {
-
-    const normalizedUsername = form.username.trim()
-    const normalizedRole = form.role.trim()
-    const normalizedPassword = form.password.trim()
-
-    const basePayload = {
-        username: normalizedUsername,
-        roles: normalizedRole ? [normalizedRole] : undefined,
-        password: normalizedPassword || undefined
-    }
-
-    if (userId.value) {
-        await updateUser(userId.value, basePayload)
-        await router.push(`/admin/user/list/`)
-        return
-    }
-
-    const created = await createUser(basePayload)
-    if (created) {
-        await router.push(`/admin/user/list/`)
-    }
-}
-</script>
--- a/frontend/composables/usePdfPrinter.ts
+++ b/frontend/composables/usePdfPrinter.ts
@@ -1,30 +1,26 @@
-import {useApi} from '~/composables/useApi'
+import { useApi } from '~/composables/useApi'

 export const usePdfPrinter = () => {
    const api = useApi()
-    const receptionStore = useReceptionStore()
-    const currentReception = receptionStore.current

-    const printPdf = async (url: string): Promise<void> => {
-        const blob = await api.getBlob(url);
+    const printPdf = async (url: string, filename = 'document.pdf'): Promise<void> => {
+        const blob = await api.getBlob(url)

        const pdfBlob = blob.type === 'application/pdf'
            ? blob
-            : new Blob([blob], { type: 'application/pdf' });
+            : new Blob([blob], { type: 'application/pdf' })

-        const blobUrl = URL.createObjectURL(pdfBlob);
+        const blobUrl = URL.createObjectURL(pdfBlob)

-        const filename = `${currentReception.identificationNumber}_${currentReception.supplier.name}_${currentReception.licensePlate}.pdf`;
-
-        const a = document.createElement('a');
-        a.href = blobUrl;
-        a.download = filename;
-        a.style.display = 'none';
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
+        const a = document.createElement('a')
+        a.href = blobUrl
+        a.download = filename
+        a.style.display = 'none'
+        document.body.appendChild(a)
+        a.click()
+        a.remove()
        // L'ouverture dans un nouvel onglet déclenche un 2e PDF sans le nom personnalisé.
-        setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000);
+        setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000)
    }

    return {
--- a/frontend/composables/useWeighing.ts
+++ b/frontend/composables/useWeighing.ts
@@ -1,8 +1,10 @@
 import type {Ref} from 'vue'
 import {computed, ref} from 'vue'
 import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
+import type {ShipmentData, ShipmentPayload, WeightShipmentEntryData } from '~/services/dto/shipment-data'
 import type {WeightData} from '~/services/dto/weight-data'
 import {getWeight} from '~/services/reception'
+import {getWeightShipment} from '~/services/shipment'
 import {createWeight, updateWeight} from '~/services/weight'

 export type WeighingMode = 'gross' | 'tare'
@@ -14,6 +16,13 @@ type UseWeighingOptions = {
    loadReception?: (id: number) => Promise<ReceptionData | null>
 }

+type UseWeighingShipmentOptions = {
+    modeShipment: WeighingMode
+    shipment: Ref<ShipmentData | null>
+    updateShipment: (id: number, payload: ShipmentPayload) => Promise<ShipmentData | null>
+    loadShipment?: (id: number) => Promise<ShipmentData | null>
+}
+
 export const useWeighing = ({
    mode,
    reception,
@@ -97,3 +106,87 @@ export const useWeighing = ({
        saveWeight
    }
 }
+
+export const useWeighingShipment = ({
+                                modeShipment,
+                                shipment,
+                                updateShipment,
+                                loadShipment
+                            }: UseWeighingShipmentOptions) => {
+    const weightData = ref<WeightData | null>(null)
+    const isFetching = ref(false)
+
+    const currentWeightEntry = computed<WeightShipmentEntryData | null>(() => {
+        const weights = shipment.value?.weights ?? []
+        return weights.find((entry) => entry.type === modeShipment) ?? null
+    })
+
+    const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
+    const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
+    const title = computed(() => (modeShipment === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
+    const showLoadingBox = computed(
+        () => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
+    )
+
+    const fetchWeight = async () => {
+        isFetching.value = true
+        weightData.value = await getWeightShipment().finally(() => {
+            isFetching.value = false
+        })
+    }
+
+    const saveWeight = async () => {
+        if (!shipment.value) {
+            return
+        }
+
+        const existingEntry = currentWeightEntry.value
+        const baseDsd = weightData.value?.dsd ?? existingEntry?.dsd ?? null
+        const baseWeight = weightData.value?.weight ?? existingEntry?.weight ?? null
+        const baseWeighedAt = weightData.value?.weighedAt ?? existingEntry?.weighedAt ?? null
+
+        if (baseWeight === null) {
+            return
+        }
+
+        if (existingEntry?.id) {
+            await updateWeight(existingEntry.id, {
+                type: modeShipment,
+                dsd: baseDsd,
+                weight: baseWeight,
+                weighedAt: baseWeighedAt
+            })
+        } else {
+            await createWeight({
+                shipment: `api/shipments/${shipment.value.id}`,
+                type: modeShipment,
+                dsd: baseDsd,
+                weight: baseWeight,
+                weighedAt: baseWeighedAt
+            })
+        }
+
+        const nextStep = modeShipment === 'tare'
+            ? shipment.value.currentStep
+            : shipment.value.currentStep + 1
+        await updateShipment(shipment.value.id, {
+            currentStep: nextStep,
+            isValid: shipment.value.isValid
+        })
+
+        if (loadShipment) {
+            await loadShipment(shipment.value.id)
+        }
+    }
+
+    return {
+        weightData,
+        currentWeightEntry,
+        displayWeight,
+        displayDsd,
+        title,
+        showLoadingBox,
+        fetchWeight,
+        saveWeight
+    }
+}
--- a/frontend/i18n/locales/fr.json
+++ b/frontend/i18n/locales/fr.json
@@ -21,6 +21,15 @@
            "update": "Impossible de mettre à jour l'éxpeditions.",
            "weigh": "Impossible de récupérer la pesée."
        },
+        "shipmentBovine": {
+            "list": "Impossible de récupérer la liste des bovins de l'éxpedition.",
+            "create": "Impossible d'enregistrer le bovin.",
+            "delete": "Impossible de supprimer le bovin.",
+            "update": "Impossible de mettre à jour le bovin."
+        },
+        "shipmentType": {
+            "list": "Impossible de récupérer la liste des types d'éxpedition."
+        },
        "receptionType": {
            "list": "Impossible de récupérer la liste des types de réception."
        },
--- a/frontend/pages/admin/dashboard.vue
+++ b/frontend/pages/admin/dashboard.vue
@@ -1,7 +1,5 @@
 <template>
-    <AdminUserForm/>
 </template>
-
 <script setup lang="ts">
 definePageMeta({
    layout: 'admin'
--- a/frontend/pages/admin/user/[[id]].vue
+++ b/frontend/pages/admin/user/[[id]].vue
@@ -1,8 +1,125 @@
 <template>
-    <UserForm/>
+    <form @submit.prevent="validate">
+        <div
+            class="flex items-center justify-between gap-10">
+            <h1 class="text-3xl font-bold uppercase">
+                {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
+            </h1>
+            <button
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                type="submit"
+            >
+                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
+            </button>
+        </div>
+
+        <div class="grid gap-y-16 gap-x-40 mb-16">
+            <UiTextInput
+                id="user-name"
+                v-model="form.username"
+                label="Nom de l'utilisateur"
+            />
+
+            <UiSelect
+                id="user-role"
+                v-model="form.role"
+                label="Rôle de l'utilisateur"
+                :options="ROLE"
+            />
+            <UiTextInput
+                id="user-password"
+                v-model="form.password"
+                label="Mot de passe"
+                type="password"
+
+            />
+
+        </div>
+    </form>
 </template>
 <script setup lang="ts">
 definePageMeta({
    layout: 'admin'
 })
+
+import {computed, reactive, ref, watch} from 'vue'
+import {ROLE} from '~/utils/constants'
+import {createUser, updateUser, getUser} from '~/services/auth'
+import type {UserData, UserFormData} from '~/services/dto/user-data'
+
+const route = useRoute()
+const router = useRouter()
+const userId = computed(() => resolveUserId(route.params.id))
+const isLoading = ref(false)
+const isHydrating = ref(false)
+
+const resolveUserId = (param: unknown) => {
+    const idStr = Array.isArray(param) ? param[0] : param
+    if (!idStr) {
+        return null
+    }
+    const id = Number(idStr)
+    return Number.isFinite(id) ? id : null
+}
+
+
+const form = reactive<UserFormData>({
+    username: '',
+    password: '',
+    role: ''
+})
+
+const hydrateFromUser = (user: UserData | null) => {
+    if (!user) {
+        return
+    }
+    isHydrating.value = true
+    form.username = user.username ?? ''
+    const roles = user.roles ?? []
+    const hasAdmin = roles.includes("ROLE_ADMIN")
+    form.role = hasAdmin ? "ROLE_ADMIN" : "ROLE_USER"
+    form.password = ''
+    isHydrating.value = false
+}
+
+watch(
+    () => userId.value,
+    async (id) => {
+        if (id === null) {
+            return
+        }
+        isLoading.value = true
+        try {
+            const user = await getUser(id)
+            hydrateFromUser(user)
+        } finally {
+            isLoading.value = false
+        }
+    },
+    {immediate: true}
+)
+
+async function validate() {
+
+    const normalizedUsername = form.username.trim()
+    const normalizedRole = form.role.trim()
+    const normalizedPassword = form.password.trim()
+
+    const basePayload = {
+        username: normalizedUsername,
+        roles: normalizedRole ? [normalizedRole] : undefined,
+        password: normalizedPassword || undefined
+    }
+
+    if (userId.value) {
+        await updateUser(userId.value, basePayload)
+        await router.push(`/admin/user/list/`)
+        return
+    }
+
+    const created = await createUser(basePayload)
+    if (created) {
+        await router.push(`/admin/user/list/`)
+    }
+}
 </script>
--- a/frontend/pages/reception/update/[[id]].vue
+++ b/frontend/pages/reception/update/[[id]].vue
@@ -137,7 +137,7 @@ import type {DriverData} from '~/services/dto/driver-data'
 import {getDriverList} from '~/services/driver'
 import type {VehicleData} from '~/services/dto/vehicle-data'
 import {getVehicleList} from '~/services/vehicle'
-import {SUPLLIER_CODE} from "~/utils/constants";
+import {SUPPLIER_CODE} from "~/utils/constants";
 import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
 import type {ReceptionData, ReceptionFormData} from "~/services/dto/reception-data";
 import {getReception} from "~/services/reception";
@@ -185,7 +185,7 @@ const selectedCarrier = computed(() =>
    carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
 )
 // Indique si le transporteur est LIOT
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
+const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
 // Adresses disponibles pour le fournisseur sélectionné
 const supplierAddresses = computed(() => {
    const supplierId = Number(form.supplierId)
--- a/frontend/pages/shipment/[[id]].vue
+++ b/frontend/pages/shipment/[[id]].vue
@@ -16,11 +16,10 @@
            >Mettre en attente
            </button>
        </div>
-        <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0"/>
-        <button
-            v-if="storeShipment?.currentStep === 1">
-            TEST ETAPE 2
-        </button>
+        <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"/>
+
    </div>
 </template>
 <script setup lang="ts">
@@ -28,9 +27,10 @@
 import {SHIPMENT_STEP_LABELS} from "~/constants/steps";
 import {storeToRefs} from "pinia";
 import {useShipmentStore} from "~/stores/shipment";
-
+import { ref, watch } from 'vue'
 const shipmentStore = useShipmentStore()
 const {current: storeShipment} = storeToRefs(shipmentStore)
+const shipmentFormRef = ref<{ saveDraft: () => Promise<void> } | null>(null)

 const route = useRoute()
 const router = useRouter()
@@ -58,15 +58,9 @@ watch (
 )

 const saveAndHold = async () => {
-    if (!shipmentStore.current) {
-        await router.push('/')
-        return
+    if (shipmentFormRef.value) {
+        await shipmentFormRef.value.saveDraft()
    }
-    await shipmentStore.updateShipment(shipmentStore.current.id, {
-        currentStep: shipmentStore.current.currentStep,
-        licencePlate: shipmentStore.current.licencePlate,
-        shipmentDate: shipmentStore.current.shipmentDate
-    })
    await router.push('/')
 }
 const handleStepSelect = async (step: number) => {
--- a/frontend/services/dto/shipment-data.ts
+++ b/frontend/services/dto/shipment-data.ts
@@ -25,6 +25,16 @@ export type ShipmentData = {
    truck?: TruckData | null
    customer?: CustomerData | null
    bovinShipments?: BovinShipmentData[] | null
+    weights?: WeightShipmentEntryData[] | null
+
+}
+
+export interface WeightShipmentEntryData {
+    id?: number
+    type: 'gross' | 'tare'
+    dsd: number | null
+    weight: number | null
+    weighedAt: string | null
 }

 export type ShipmentFormData = {
@@ -48,4 +58,8 @@ export type ShipmentPayload = {
    truck?: string | null
    customer?: string | null
    bovinShipments?: string[] | null
+    address?: string | null
+    user?: string | null
+    driver?: string | null
+
 }
--- a/frontend/services/shipment-type.ts
+++ b/frontend/services/shipment-type.ts
@@ -9,7 +9,7 @@ export type ShipmentTypeListResponse =
 export async function getShipmentTypeList(): Promise<ShipmentTypeData[]> {
    const api = useApi()
    const response = await api.get<ShipmentTypeListResponse>('shipment_types', {}, {
-        toastErrorKey: 'errors.shipment_type.list'
+        toastErrorKey: 'errors.shipmentType.list'
    })

    if (Array.isArray(response)) {
--- a/frontend/services/shipment.ts
+++ b/frontend/services/shipment.ts
@@ -32,7 +32,7 @@ export async function updateShipment(id: number, payload: ShipmentPayload) {
    })
 }

-export async function getWeight(): Promise<WeightData> {
+export async function getWeightShipment(): Promise<WeightData> {
    const api = useApi()
    return api.get<WeightData>('shipments/weigh', {}, {
        toastErrorKey: 'errors.shipment.weigh'
--- a/frontend/services/weight.ts
+++ b/frontend/services/weight.ts
@@ -2,7 +2,8 @@ import { useApi } from '~/composables/useApi'
 import type { WeightEntryData } from '~/services/dto/reception-data'

 export type WeightPayload = {
-    reception: string
+    reception?: string
+    shipment?: string
    type: 'gross' | 'tare'
    dsd: number | null
    weight: number | null
--- a/frontend/utils/constants.ts
+++ b/frontend/utils/constants.ts
@@ -12,6 +12,6 @@ export const ROLE = [
    { label: 'Administrateur', value: 'ROLE_ADMIN' },
    { label: 'Utilisateur', value: 'ROLE_USER' }
 ]
-export const SUPLLIER_CODE = {
+export const SUPPLIER_CODE = {
    LIOT: 'LIOT'
 }