feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)

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

@@ -36,7 +36,7 @@
 <script setup lang="ts">
 import type {BovineTypeData} from "~/services/dto/bovine-type-data";
 import {getBovineTypeList} from "~/services/bovine-type";
-import {MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES} from "~/utils/constants";
+import {RECEPTION_TYPE_CODES} from "~/utils/constants";
 import {useReceptionStore} from '~/stores/reception'
 import {
     createReceptionBovine,
@@ -46,6 +46,7 @@ import {
 } from "~/services/reception-bovine";
 import {computed, onMounted, reactive, ref, watch} from "vue";
 
+const toast = useToast()
 const isLoadingBovineType = ref(false)
 const bovineType = ref<BovineTypeData[]>([])
 const receptionStore = useReceptionStore()
@@ -55,19 +56,13 @@ const receptionId = computed(() => receptionStore.current?.id ?? null)
 const receptionIri = computed(() =>
     receptionId.value ? `/api/receptions/${receptionId.value}` : null
 )
-const toast = useToast()
-const nuxtApp = useNuxtApp()
-const i18n = nuxtApp.$i18n as { t: (key: string) => string } |
-    undefined
-const t = (key: string) => (i18n?.t ? String(i18n.t(key)) : key)
-const totalBovineQuantity = computed(() => {
-    const baseTotal = Object.values(bovineQuantities).reduce((sum, value) => {
-        const n = typeof value === 'number' ? value : 0
-        return sum + n
+const totalBovines = computed(() => {
+    const base = Object.values(bovineQuantities).reduce((sum, value) => {
+        return sum + (value ?? 0)
     }, 0)
-    const other = typeof otherQuantity.value === 'number' ? otherQuantity.value : 0
-    return baseTotal + other
+    return base + (otherQuantity.value ?? 0)
 })
+
 const loadBovineType = async () => {
     isLoadingBovineType.value = true
     try {
@@ -117,6 +112,7 @@ watch(
 async function syncBovineSelections(receptionIri: string) {
     const existing = await getReceptionBovineList(receptionIri)
     const existingMap = new Map<string, { id: number; quantity: number | null }>()
+
     for (const selection of existing) {
         const bovineTypeId = String(selection.bovineType.id)
         existingMap.set(bovineTypeId, {
@@ -159,37 +155,21 @@ async function syncBovineSelections(receptionIri: string) {
         })
     }
 }
-const hasNegativeQuantity = computed(() => {
-    const anyNegativeInTypes =
-        Object.values(bovineQuantities).some((value) => {
-            return typeof value === 'number' && value < 0
-        })
 
-    const otherNegative =
-        typeof otherQuantity.value === 'number' &&
-        otherQuantity.value < 0
-
-    return anyNegativeInTypes || otherNegative
-})
 async function goNext() {
     if (!receptionStore.current || !receptionIri.value) {
         return
     }
-    if (hasNegativeQuantity.value) {
-        toast.error({
-            title: 'Erreur',
-            message: ("La quantité de bovins ne peut pas être négative.")
-        })
-        return
-    }
-    // Le 52 à vérifier
-    if (totalBovineQuantity.value > 52) {
+
+    // @TODO Ajouter un composable pour le toaster qui gère les key i18n
+    if (totalBovines.value > 52) {
         toast.error({
             title: 'Erreur',
             message: ('Le total des bovins ne peut pas dépasser 52.')
         })
         return
     }
+
     const nextStep = receptionStore.current.currentStep + 1
     await syncBovineSelections(receptionIri.value)
 

frontend/components/reception/reception-form.vue

@@ -222,10 +222,12 @@ const filteredVehicles = computed<VehicleData[]>(() => {
             (!form.truckId || String(vehicle.truck?.id) === form.truckId)
     )
 })
+
 const selectedReceptionType = computed(() =>
     receptionTypes.value.find((type) => String(type.id) === form.receptionTypeId) ?? null
 )
 
+// Supprime les données bovines si on change de type de réception
 const clearReceptionBovines = async (receptionIri: string) => {
     const existing = await getReceptionBovineList(receptionIri)
     for (const selection of existing) {
@@ -471,9 +473,6 @@ async function validate() {
     const normalizedTruckId = form.truckId.trim()
     const normalizedCarrierId = form.carrierId.trim()
     const normalizedDriverId = form.driverId.trim()
-    const previousTypeCode = receptionStore.current.receptionType?.code ?? null
-    const nextTypeCode = selectedReceptionType.value?.code ?? null
-    const receptionIri = `/api/receptions/${receptionStore.current.id}`
     const receptionTypeIri = normalizedReceptionTypeId
         ? `/api/reception_types/${normalizedReceptionTypeId}`
         : null
@@ -522,6 +521,11 @@ async function validate() {
         }
         return
     }
+
+    const previousTypeCode = receptionStore.current.receptionType?.code ?? null
+    const nextTypeCode = selectedReceptionType.value?.code ?? null
+    const receptionIri = `/api/receptions/${receptionStore.current.id}`
+
     if (
         previousTypeCode === RECEPTION_TYPE_CODES.BOVINS &&
         nextTypeCode === RECEPTION_TYPE_CODES.MERCHANDISES

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

@@ -1,6 +1,5 @@
 <template>
     <div class="flex flex-col items-center gap-16">
-        <!--        @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins      -->
         <div
             v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
             class="flex flex-col gap-16 items-center w-full">
@@ -99,7 +98,6 @@ const selectedBuildingIds = ref<string[]>([])
 const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
 const merchandiseDetail = ref('')
 
-
 // Extrait l'ID d'une relation depuis un IRI ou un objet complet.
 const getRelationId = (value: unknown): string | null => {
     if (!value) {