feat : Ajout d'un composable pour la pesée qui sera réutilisable pour l'expédition, ajout de contrainte sur les entity de reception et weight pour plus de robustesse et correction de la class active des liens dans la nav

frontend/components/reception/reception-weight.vue

@@ -25,12 +25,12 @@
     <div class="flex justify-center mt-[54px]">
         <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            @click="getReceptionWeight"
+            @click="fetchWeight"
         >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
         <button
             v-if="displayWeight !== null"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
-            @click="validateWeight"
+            @click="saveWeight"
         >Valider la pesée</button>
     </div>
 
@@ -38,73 +38,30 @@
 
 <script setup lang="ts">
 import { storeToRefs } from 'pinia'
-import { getWeight } from '~/services/reception'
-import type { WeightData } from '~/services/dto/weight-data'
-import { createWeight, updateWeight } from '~/services/weight'
+import { useWeighing } from '~/composables/useWeighing'
 import { useReceptionStore } from '~/stores/reception'
 
 const props = defineProps<{
     mode: 'gross' | 'tare'
 }>()
 
-const weightData = ref<WeightData | null>(null)
-const localErrorMessage = ref<string | null>(null)
 const receptionStore = useReceptionStore()
 const { current: storeReception, errorMessage: storeErrorMessage } = storeToRefs(receptionStore)
-const errorMessage = computed(() => localErrorMessage.value ?? storeErrorMessage.value)
-const currentWeightEntry = computed(
-    () => storeReception.value?.weights?.find((entry) => entry.type === props.mode) ?? null
-)
-const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
-const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
-const title = computed(() => (props.mode === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
-const showLoadingBox = computed(() => displayWeight.value === null && !errorMessage.value)
-
-async function getReceptionWeight() {
-    localErrorMessage.value = null
-    try {
-        weightData.value = await getWeight()
-    } catch (error) {
-        localErrorMessage.value = error?.data?.error ?? error?.message ?? 'Erreur inconnue.'
-    }
-}
-
-async function validateWeight() {
-    localErrorMessage.value = null
-
-    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
-
-    try {
-        if (existingEntry?.id) {
-            await updateWeight(existingEntry.id, {
-                type: props.mode,
-                dsd: baseDsd,
-                weight: baseWeight,
-                weighedAt: baseWeighedAt
-            })
-        } else {
-            await createWeight({
-                reception: `/receptions/${storeReception.value.id}`,
-                type: props.mode,
-                dsd: baseDsd,
-                weight: baseWeight,
-                weighedAt: baseWeighedAt
-            })
-        }
-    } catch (error) {
-        localErrorMessage.value = error?.data?.error ?? error?.message ?? 'Erreur inconnue.'
-        return
-    }
-    // @TODO Voir comment mettre en place la genération du bon, la validation de la reception et le dernier step
-    const nextStep = storeReception.value.currentStep + 1
-    await receptionStore.updateReception(storeReception.value.id, {
-        currentStep: nextStep,
-        isValid: props.mode === 'tare' ? true : storeReception.value.isValid
-    })
-    await receptionStore.loadReception(storeReception.value.id)
-}
+const {
+    displayWeight,
+    displayDsd,
+    title,
+    errorMessage,
+    showLoadingBox,
+    fetchWeight,
+    saveWeight
+} = useWeighing({
+    mode: props.mode,
+    reception: storeReception,
+    updateReception: receptionStore.updateReception,
+    loadReception: receptionStore.loadReception,
+    storeError: storeErrorMessage
+})
+// @TODO Voir comment mettre en place la genération du bon, la validation de la reception et le dernier step
 
 </script>

frontend/composables/useWeighing.ts

@@ -0,0 +1,109 @@
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { ReceptionData, WeightEntryData } from '~/services/dto/reception-data'
+import type { WeightData } from '~/services/dto/weight-data'
+import { getWeight } from '~/services/reception'
+import { createWeight, updateWeight } from '~/services/weight'
+
+export type WeighingMode = 'gross' | 'tare'
+
+type UseWeighingOptions = {
+    mode: WeighingMode
+    reception: Ref<ReceptionData | null>
+    updateReception: (id: number, payload: Partial<ReceptionData>) => Promise<ReceptionData | null>
+    loadReception?: (id: number) => Promise<ReceptionData | null>
+    storeError?: Ref<string | null>
+}
+
+export const useWeighing = ({
+    mode,
+    reception,
+    updateReception,
+    loadReception,
+    storeError
+}: UseWeighingOptions) => {
+    const weightData = ref<WeightData | null>(null)
+    const localErrorMessage = ref<string | null>(null)
+
+    const currentWeightEntry = computed<WeightEntryData | null>(() => {
+        const weights = reception.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 errorMessage = computed(() => localErrorMessage.value ?? storeError?.value ?? null)
+    const showLoadingBox = computed(() => displayWeight.value === null && !errorMessage.value)
+
+    const fetchWeight = async () => {
+        localErrorMessage.value = null
+        try {
+            weightData.value = await getWeight()
+        } catch (error) {
+            localErrorMessage.value = error?.data?.error ?? error?.message ?? 'Erreur inconnue.'
+        }
+    }
+
+    const saveWeight = async () => {
+        localErrorMessage.value = null
+        if (!reception.value) {
+            localErrorMessage.value = 'Réception introuvable.'
+            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) {
+            localErrorMessage.value = 'Veuillez d’abord peser.'
+            return
+        }
+
+        try {
+            if (existingEntry?.id) {
+                await updateWeight(existingEntry.id, {
+                    type: mode,
+                    dsd: baseDsd,
+                    weight: baseWeight,
+                    weighedAt: baseWeighedAt
+                })
+            } else {
+                await createWeight({
+                    reception: `/receptions/${reception.value.id}`,
+                    type: mode,
+                    dsd: baseDsd,
+                    weight: baseWeight,
+                    weighedAt: baseWeighedAt
+                })
+            }
+        } catch (error) {
+            localErrorMessage.value = error?.data?.error ?? error?.message ?? 'Erreur inconnue.'
+            return
+        }
+
+        const nextStep = reception.value.currentStep + 1
+        await updateReception(reception.value.id, {
+            currentStep: nextStep,
+            isValid: mode === 'tare' ? true : reception.value.isValid
+        })
+
+        if (loadReception) {
+            await loadReception(reception.value.id)
+        }
+    }
+
+    return {
+        weightData,
+        currentWeightEntry,
+        displayWeight,
+        displayDsd,
+        title,
+        errorMessage,
+        showLoadingBox,
+        fetchWeight,
+        saveWeight
+    }
+}

frontend/layouts/default.vue

@@ -23,7 +23,7 @@
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="isActive ? 'opacity-100' : 'opacity-50'"
+                            :class="isReceptionActive ? 'opacity-100' : 'opacity-50'"
                         >
                             Reception
                         </a>
@@ -36,3 +36,8 @@
         </main>
     </div>
 </template>
+
+<script setup lang="ts">
+const route = useRoute()
+const isReceptionActive = computed(() => route.path.startsWith('/reception'))
+</script>

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

@@ -3,7 +3,7 @@
     <div v-else>
         <div class="flex justify-between h-[52px] mb-[90px]">
             <p class="self-center">Indicateur d’étapes</p>
-            <NuxtLink to="/" class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center">Mettre en pause</NuxtLink>
+            <NuxtLink to="/" class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center">Mettre en attente</NuxtLink>
         </div>
         <ReceptionForm v-if="storeReception?.currentStep === 0"/>
         <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
@@ -20,7 +20,7 @@ const route = useRoute()
 const router = useRouter()
 
 const receptionStore = useReceptionStore()
-const { current: storeReception, isLoading, errorMessage } = storeToRefs(receptionStore)
+const { current: storeReception, errorMessage } = storeToRefs(receptionStore)
 
 onMounted(async () => {
     const raw = route.params.id