fix : correction des retours de la V0

2026-03-18 14:47:03 +01:00
parent 995e7de2cc
commit a905c6a1de
64 changed files with 1979 additions and 1640 deletions
@@ -0,0 +1,77 @@
+import type { Ref } from 'vue'
+import { useWeighing } from '~/composables/useWeighing'
+import { usePdfPrinter } from '~/composables/usePdfPrinter'
+import type { WeightData } from '~/services/dto/weight-data'
+
+interface UseWeighingStepOptions {
+    mode: 'gross' | 'tare'
+    entity: Ref<any>
+    entityName: 'reception' | 'shipment'
+    apiResource: string
+    titleLabel: string
+    isFinal: boolean
+    getWeightFromScale: () => Promise<WeightData>
+    updateEntity: (id: number, payload: any) => Promise<any>
+    loadEntity: (id: number) => Promise<any>
+    clearEntity: () => void
+    buildReceiptFilename: (entity: any) => string
+}
+
+export const useWeighingStep = (options: UseWeighingStepOptions) => {
+    const router = useRouter()
+    const { printPdf } = usePdfPrinter()
+
+    const {
+        weightData,
+        currentWeightEntry,
+        displayWeight,
+        displayDsd,
+        title,
+        showLoadingBox,
+        fetchWeight,
+        saveWeight
+    } = useWeighing({
+        mode: options.mode,
+        entity: options.entity,
+        entityName: options.entityName,
+        apiResource: options.apiResource,
+        titleLabel: options.titleLabel,
+        getWeightFromScale: options.getWeightFromScale,
+        updateEntity: options.updateEntity,
+        loadEntity: options.loadEntity
+    })
+
+    const showGenerateReceipt = computed(
+        () => options.isFinal && displayWeight.value !== null
+    )
+
+    const printReceipt = async () => {
+        if (!import.meta.client || !options.entity.value) return
+
+        await saveWeight()
+        const entity = options.entity.value
+        const filename = options.buildReceiptFilename(entity)
+        await printPdf(`/${options.apiResource}/${entity.id}/receipt`, filename)
+
+        await new Promise((resolve) => setTimeout(resolve, 600))
+
+        const result = await options.updateEntity(entity.id, { isValid: true })
+        if (!result) return
+
+        options.clearEntity()
+        await router.push('/')
+    }
+
+    return {
+        weightData,
+        currentWeightEntry,
+        displayWeight,
+        displayDsd,
+        title,
+        showLoadingBox,
+        fetchWeight,
+        saveWeight,
+        showGenerateReceipt,
+        printReceipt
+    }
+}
@@ -0,0 +1,54 @@
+import type { Ref } from 'vue'
+import type { AddressData } from '~/services/dto/address-data'
+
+interface AddressOwner {
+    id: number
+    addresses?: AddressData[]
+}
+
+export const useAddressSync = (
+    form: { addressId: string },
+    ownerId: Ref<string>,
+    owners: Ref<AddressOwner[]>
+) => {
+    const ownerAddresses = computed<AddressData[]>(() => {
+        const id = Number(ownerId.value)
+        if (!Number.isFinite(id)) return []
+        return owners.value.find((owner) => owner.id === id)?.addresses ?? []
+    })
+
+    const addressOptions = computed(() =>
+        ownerAddresses.value.map((address) => ({
+            value: String(address.id),
+            label: address.fullAddress
+        }))
+    )
+
+    watch(
+        () => [ownerId.value, form.addressId, owners.value],
+        () => {
+            if (!ownerId.value) {
+                form.addressId = ''
+                return
+            }
+            if (!form.addressId && ownerAddresses.value.length === 1) {
+                form.addressId = String(ownerAddresses.value[0].id)
+                return
+            }
+            if (!form.addressId) return
+            const matches = ownerAddresses.value.some(
+                (address) => String(address.id) === form.addressId
+            )
+            if (!matches) {
+                if (ownerAddresses.value.length === 1) {
+                    form.addressId = String(ownerAddresses.value[0].id)
+                } else {
+                    form.addressId = ''
+                }
+            }
+        },
+        { immediate: true }
+    )
+
+    return { ownerAddresses, addressOptions }
+}
@@ -0,0 +1,73 @@
+import type { UserData } from '~/services/dto/user-data'
+import type { TruckData } from '~/services/dto/truck-data'
+import type { CarrierData } from '~/services/dto/carrier-data'
+import { getUsers } from '~/services/auth'
+import { getTruckList } from '~/services/truck'
+import { getCarrierList } from '~/services/carrier'
+import { useAuthStore } from '~/stores/auth'
+
+export const useFormDataLoading = (form: { userId: string }) => {
+    const users = ref<UserData[]>([])
+    const trucks = ref<TruckData[]>([])
+    const carriers = ref<CarrierData[]>([])
+    const isLoadingUsers = ref(false)
+    const isLoadingTrucks = ref(false)
+    const isLoadingCarriers = ref(false)
+    const authStore = useAuthStore()
+
+    const loadUsers = async () => {
+        isLoadingUsers.value = true
+        try {
+            users.value = await getUsers()
+        } finally {
+            isLoadingUsers.value = false
+        }
+    }
+
+    const loadTrucks = async () => {
+        isLoadingTrucks.value = true
+        try {
+            trucks.value = await getTruckList()
+        } finally {
+            isLoadingTrucks.value = false
+        }
+    }
+
+    const loadCarriers = async () => {
+        isLoadingCarriers.value = true
+        try {
+            carriers.value = await getCarrierList()
+        } finally {
+            isLoadingCarriers.value = false
+        }
+    }
+
+    const setDefaultUser = () => {
+        if (form.userId) return
+        if (authStore.user?.id) {
+            form.userId = String(authStore.user.id)
+        }
+    }
+
+    const loadCommonData = async () => {
+        await loadUsers()
+        await loadTrucks()
+        await loadCarriers()
+        await authStore.ensureSession()
+        setDefaultUser()
+    }
+
+    return {
+        users,
+        trucks,
+        carriers,
+        isLoadingUsers,
+        isLoadingTrucks,
+        isLoadingCarriers,
+        loadUsers,
+        loadTrucks,
+        loadCarriers,
+        setDefaultUser,
+        loadCommonData
+    }
+}
@@ -0,0 +1,153 @@
+import type { Ref } from 'vue'
+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 { getDriverList } from '~/services/driver'
+import { getVehicleList } from '~/services/vehicle'
+import { SUPPLIER_CODE } from '~/utils/constants'
+
+interface LiotForm {
+    carrierId: string
+    truckId: string
+    driverId: string
+    vehicleId: string
+    licensePlate: string
+}
+
+export const useLiotHandling = (
+    form: LiotForm,
+    carriers: Ref<CarrierData[]>,
+    isHydrating: Ref<boolean>
+) => {
+    const drivers = ref<DriverData[]>([])
+    const vehicles = ref<VehicleData[]>([])
+    const isLoadingDrivers = ref(false)
+    const isLoadingVehicles = ref(false)
+    const allowAnyLicensePlate = ref(false)
+
+    const selectedCarrier = computed(() =>
+        carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
+    )
+
+    const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
+
+    const filteredDrivers = computed<DriverData[]>(() => {
+        if (!form.carrierId) return []
+        return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
+    })
+
+    const filteredVehicles = computed<VehicleData[]>(() => {
+        if (!form.carrierId) return []
+        return vehicles.value.filter(
+            (vehicle) =>
+                String(vehicle.carrier?.id) === form.carrierId &&
+                (!form.truckId || String(vehicle.truck?.id) === form.truckId)
+        )
+    })
+
+    const loadDrivers = async () => {
+        isLoadingDrivers.value = true
+        try {
+            drivers.value = await getDriverList()
+        } finally {
+            isLoadingDrivers.value = false
+        }
+    }
+
+    const loadVehicles = async () => {
+        isLoadingVehicles.value = true
+        try {
+            vehicles.value = await getVehicleList()
+        } finally {
+            isLoadingVehicles.value = false
+        }
+    }
+
+    // Auto-select driver/vehicle when carrier changes
+    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)
+            }
+        },
+        { immediate: true }
+    )
+
+    // Validate/auto-select vehicle when truck/carrier changes
+    watch(
+        () => [form.truckId, form.carrierId, vehicles.value],
+        () => {
+            if (!isLiotCarrier.value) return
+            if (filteredVehicles.value.length === 1) {
+                form.vehicleId = String(filteredVehicles.value[0].id)
+                return
+            }
+            if (!form.vehicleId) return
+            const matches = filteredVehicles.value.some(
+                (vehicle) => String(vehicle.id) === form.vehicleId
+            )
+            if (!matches) {
+                form.vehicleId = ''
+            }
+        },
+        { immediate: true }
+    )
+
+    // Sync license plate from selected vehicle
+    watch(
+        () => [form.vehicleId, form.carrierId, vehicles.value],
+        () => {
+            if (!isLiotCarrier.value) return
+            if (isHydrating.value) return
+            const selected = filteredVehicles.value.find(
+                (vehicle) => String(vehicle.id) === form.vehicleId
+            )
+            if (selected) {
+                form.licensePlate = selected.plate
+                allowAnyLicensePlate.value = false
+            }
+        }
+    )
+
+    // Auto-select vehicle from license plate
+    watch(
+        () => [form.licensePlate, form.carrierId, vehicles.value],
+        () => {
+            if (!isLiotCarrier.value || form.vehicleId) return
+            const match = filteredVehicles.value.find(
+                (vehicle) => vehicle.plate === form.licensePlate
+            )
+            if (match) {
+                form.vehicleId = String(match.id)
+            }
+        }
+    )
+
+    return {
+        drivers,
+        vehicles,
+        isLoadingDrivers,
+        isLoadingVehicles,
+        allowAnyLicensePlate,
+        isLiotCarrier,
+        filteredDrivers,
+        filteredVehicles,
+        loadDrivers,
+        loadVehicles
+    }
+}
@@ -1,54 +1,64 @@
-import {computed, ref} from 'vue'
-import type {WeightEntryData} from '~/services/dto/reception-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'
-import type {UseWeighingShipmentOptions, UseWeighingOptions} from '~/services/weight'
-import type {WeightShipmentEntryData} from "~/services/dto/shipment-data";
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { WeightEntryData } from '~/services/dto/reception-data'
+import type { WeightData } from '~/services/dto/weight-data'
+import { createWeight, updateWeight } from '~/services/weight'

 export type WeighingMode = 'gross' | 'tare'

+export interface UseWeighingOptions {
+    mode: WeighingMode
+    entity: Ref<{ id: number; currentStep: number; isValid: boolean; weights?: WeightEntryData[] | null } | null>
+    entityName: 'reception' | 'shipment'
+    apiResource: string
+    titleLabel: string
+    getWeightFromScale: () => Promise<WeightData>
+    updateEntity: (id: number, payload: any) => Promise<any>
+    loadEntity?: (id: number) => Promise<any>
+}

 export const useWeighing = ({
-                                mode,
-                                reception,
-                                updateReception,
-                                loadReception
-                            }: UseWeighingOptions) => {
+    mode,
+    entity,
+    entityName,
+    apiResource,
+    titleLabel,
+    getWeightFromScale,
+    updateEntity,
+    loadEntity
+}: UseWeighingOptions) => {
    const weightData = ref<WeightData | null>(null)
    const isFetching = ref(false)

    const currentWeightEntry = computed<WeightEntryData | null>(() => {
-        const weights = reception.value?.weights ?? []
+        const weights = entity.value?.weights ?? []
        return weights.find((entry) => entry.type === mode) ?? null
    })

    const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
    const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
-    const title = computed(() => (mode === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
+    const title = computed(() => titleLabel)
    const showLoadingBox = computed(() => isFetching.value)

    const fetchWeight = async () => {
        isFetching.value = true
-        weightData.value = await getWeight().finally(() => {
+        weightData.value = await getWeightFromScale().finally(() => {
            isFetching.value = false
        })
    }

    const saveWeight = async () => {
-        if (!reception.value) {
-            return
-        }
+        if (!entity.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 (baseWeight === null) return
+
+        const relationPayload: Record<string, string> = {}
+        relationPayload[entityName] = `/api/${apiResource}/${entity.value.id}`

        if (existingEntry?.id) {
            await updateWeight(existingEntry.id, {
@@ -59,7 +69,7 @@ export const useWeighing = ({
            })
        } else {
            await createWeight({
-                reception: `/api/receptions/${reception.value.id}`,
+                ...relationPayload,
                type: mode,
                dsd: baseDsd,
                weight: baseWeight,
@@ -68,15 +78,15 @@ export const useWeighing = ({
        }

        const nextStep = mode === 'tare'
-            ? reception.value.currentStep
-            : reception.value.currentStep + 1
-        await updateReception(reception.value.id, {
+            ? entity.value.currentStep
+            : entity.value.currentStep + 1
+        await updateEntity(entity.value.id, {
            currentStep: nextStep,
-            isValid: reception.value.isValid
+            isValid: entity.value.isValid
        })

-        if (loadReception) {
-            await loadReception(reception.value.id)
+        if (loadEntity) {
+            await loadEntity(entity.value.id)
        }
    }

@@ -92,84 +102,29 @@ export const useWeighing = ({
    }
 }

+// Backward-compatible aliases
 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
+    modeShipment,
+    shipment,
+    updateShipment,
+    loadShipment
+}: {
+    modeShipment: WeighingMode
+    shipment: Ref<any>
+    updateShipment: (id: number, payload: any) => Promise<any>
+    loadShipment?: (id: number) => Promise<any>
+}) => {
+    return useWeighing({
+        mode: modeShipment,
+        entity: shipment,
+        entityName: 'shipment',
+        apiResource: 'shipments',
+        titleLabel: modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein',
+        getWeightFromScale: async () => {
+            const { getWeightShipment } = await import('~/services/shipment')
+            return getWeightShipment()
+        },
+        updateEntity: updateShipment,
+        loadEntity: loadShipment
    })
-
-    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 à vide' : 'Pesée à plein'))
-    const showLoadingBox = computed(() => isFetching.value)
-
-    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
-    }
 }
@@ -0,0 +1,83 @@
+import type { Ref } from 'vue'
+import type { WorkflowConfig } from '~/types/workflow'
+
+interface WorkflowStore {
+    current: any
+    isLoading: boolean
+    clearCurrent: () => void
+    [key: string]: any
+}
+
+export const useWorkflowSteps = (config: WorkflowConfig, store: WorkflowStore) => {
+    const route = useRoute()
+    const router = useRouter()
+
+    const stepLabels = config.steps.map(s => s.label)
+
+    const currentStep = computed(() => store.current?.currentStep ?? 0)
+    const entity = computed(() => store.current)
+
+    const loadMethod = `load${config.entityName.charAt(0).toUpperCase() + config.entityName.slice(1)}`
+    const updateMethod = `update${config.entityName.charAt(0).toUpperCase() + config.entityName.slice(1)}`
+
+    const resolveId = (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 init = () => {
+        watch(
+            () => route.params.id,
+            async (param) => {
+                const id = resolveId(param)
+                if (id === null) {
+                    store.clearCurrent()
+                    return
+                }
+                await store[loadMethod](id)
+            },
+            { immediate: true }
+        )
+    }
+
+    const saveAndHold = async () => {
+        if (!store.current) {
+            await router.push('/')
+            return
+        }
+        const datePayload: Record<string, any> = {}
+        datePayload[config.dateField] = store.current[config.dateField]
+        await store[updateMethod](store.current.id, {
+            currentStep: store.current.currentStep,
+            licensePlate: store.current.licensePlate,
+            ...datePayload
+        })
+        await router.push('/')
+    }
+
+    const handleStepSelect = async (step: number) => {
+        if (!store.current) return
+        if (step === store.current.currentStep) return
+        await store[updateMethod](store.current.id, { currentStep: step })
+        await store[loadMethod](store.current.id)
+    }
+
+    const advanceStep = async () => {
+        if (!store.current) return
+        const nextStep = store.current.currentStep + 1
+        await store[updateMethod](store.current.id, { currentStep: nextStep })
+        await store[loadMethod](store.current.id)
+    }
+
+    return {
+        stepLabels,
+        currentStep,
+        entity,
+        init,
+        saveAndHold,
+        handleStepSelect,
+        advanceStep
+    }
+}