Merge branch 'refs/heads/develop' into feat/poc-identification-bovin

# Conflicts:
#	.idea/workspace.xml
#	frontend/i18n/locales/fr.json
#	frontend/layouts/default.vue

.idea/workspace.xml

@@ -5,10 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
+      <change beforePath="$PROJECT_DIR$/.idea/data_source_mapping.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/BuildingCase.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BuildingCase.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -40,7 +39,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="fit/332-refonte-reception-terminee" />
+        <entry key="$PROJECT_DIR$" value="feat/276-lister-expeditions-terminees" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -224,39 +223,38 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.MCP Project settings loaded": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "git-widget-placeholder": "feat/278-plan-du-site",
-    "last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/m-tristan/workspace/Ferme",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;fix/325-corrections-diverses&quot;,
+    &quot;last_opened_file_path&quot;: &quot;//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme/frontend/pages/shipment&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "postgresql"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;postgresql&quot;
     ],
-    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
-      "TEXT"
+    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
+      &quot;TEXT&quot;
     ],
-    "vue.recent.templates": [
-      "Vue Composition API Component"
+    &quot;vue.recent.templates&quot;: [
+      &quot;Vue Composition API Component&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\pages\shipment" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\composables" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
@@ -817,4 +815,4 @@
       <option value=".github/prompts" />
     </promptFileLocations>
   </component>
-</project>
+</project>

AGENTS.md

@@ -8,7 +8,6 @@ Project overview
 Backend conventions
 - Use English for code identifiers/messages; keep “pont-bascule” as domain term.
 - API Platform operations are defined on Doctrine entities.
-- No custom repository classes are used (`src/Repository` removed); use default Doctrine repositories via `EntityManagerInterface`.
 - Reception entity is in `src/Entity/Reception.php`, with custom weigh endpoint `/receptions/weigh`.
 - Reception fields: `date_reception`, `license_plate`, `current_step` (default 0), `is_valid` (default false).
 - Reception also has `identification_number` (auto `N-BR-####`), `merchandise_type`, `merchandise_detail`, `buildings` (M2M), and `pellet_buildings` (via `reception_pellet_building`).
@@ -18,13 +17,6 @@ Backend conventions
 - Custom exception: `App\Exception\PontBasculeException` with French messages, mapped to 500 in provider.
 - Parsing of pont-bascule payload is in `src/Service/PontBasculePayloadDecoder.php`.
 - `config/reference.php` is auto-generated; keep it.
-- Bovine storage:
-  - `src/Entity/Bovine.php` with fields `nationalNumber` (unique), `receivedWeight`, `arrivalDate`, and `buildingCase` (ManyToOne).
-  - `src/Entity/BuildingCase.php` has `bovines` (OneToMany).
-- Case PDF report:
-  - Endpoint: `GET /building_cases/{id}/weights-report` (provider: `App\State\BuildingCaseWeightsReportProvider`).
-  - Template: `templates/case_weights_report.html.twig`.
-  - Projection logic is done in backend from `arrivalDate`; daily gain is currently fixed at `1.3 kg/day` for all races.
 
 Frontend conventions
 - Nuxt SSR disabled; Tailwind used.
@@ -44,7 +36,6 @@ Frontend conventions
 - Service layer lives in `frontend/services/` with typed DTOs in `frontend/services/dto/`.
 - Reception service uses `receptions`, `receptions/{id}`, `receptions/weigh` and supports success/error toast keys.
 - Reception receipt endpoint is `receptions/{id}/receipt` (PDF) via `frontend/composables/usePdfPrinter.ts`.
-- Infrastructure case page prints the case weight report PDF from `frontend/pages/infrastructure/case.vue` using `usePdfPrinter('/building_cases/{id}/weights-report')`.
 
 Environment & routing
 - Frontend dev server: `npm run dev` in `frontend/`.
@@ -56,11 +47,6 @@ Environment & routing
 Notes
 - Do not add a GET that creates resources; use POST + PATCH.
 - Keep endpoints in plural (API Platform convention).
-- Seed and fixtures conventions:
-  - `app:seed` now seeds infrastructure (`statut`, `building_layout`, `building_case`, `building_case_position`) and bovines.
-  - `app:seed` uses intermediate flushes (after buildings and after infrastructure) so find queries can resolve just-created records.
-  - Bovine seed rows use a legacy case token mapping to building-case code (`B{building}-C{case}`) before fallback to direct id lookup.
-  - Fixtures include `BuildingInfrastructureFixtures` + `BovineFixtures` (via `AppFixtures` dependencies).
 - New reference data added:
   - Reception types (`reception_type`, fields: `label`, `code`), selectable on reception form.
   - Merchandise types (`merchandise_type`, fields: `label`, `code`) and pellet types (`pellet_type`, fields: `label`, `code`).

CHANGELOG.md

@@ -46,15 +46,7 @@ Ajouter dans le fichier .env du frontend
 * [#324] Creation page admin listing clients
 * [#326] Admin modification creation client
 * [#325] Correction diverses
-* fix layout admin
-* Creation page admin listing bovins
-* Creation page admin ajout/modification bovins
-* [#331] Mettre à jour l'entité Shipment et bovin_shipment
-* [#278] Plan du site
-* [#334] Correctifs
-* [#332] Refonte écran réception terminée
 
 ### Changed
 
 ### Fixed
-

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.61'
+    app.version: '0.0.44'

frontend/components/address.vue

@@ -8,12 +8,11 @@
             </div>
 
             <button
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading"
             >
-                <Icon :name="props.address ? 'mdi:check' : 'mdi:plus'" size="28" />
-                {{ props.address? "Valider" : "Ajouter" }}
+                {{ props.address? "Sauvegarder" : "Ajouter" }}
             </button>
         </div>
 
@@ -23,13 +22,13 @@
             <UiTextInput id="address-street2" v-model="form.street2" label="Complément" />
             <UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" />
             <UiTextInput id="address-city" v-model="form.city" label="Ville" />
-            <UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
+            <UiTextInput id="address-country" v-model="form.countryCode" label="Pays" />
         </div>
     </form>
 </template>
 
 <script setup lang="ts">
-import type { AddressPayload } from "~/services/address"
+import { AddressPayload } from "~/services/address"
 
 
 const route = useRoute()

frontend/components/card-link.vue

@@ -2,22 +2,22 @@
 
 <template>
     <NuxtLink :to="link">
-        <div class="w-[300px] h-[216px] border border-primary-700 rounded-lg p-6 flex flex-col justify-between gap-4">
+        <div class="w-[324px] h-[228px] border border-black rounded-md p-6 flex flex-col justify-between">
             <div class="flex justify-between">
-                <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
-                    <Icon :name="iconName" class="!text-primary-700" size="44" />
+                <div class="rounded-full w-[80px] h-[80px] bg-neutral-400 flex justify-center items-center">
+                    <Icon :name="iconName" style="color: black" size="44" />
                 </div>
                 <div>
                     <Icon name="mdi:plus" style="color: black" size="44"  />
                 </div>
             </div>
             <div class="uppercase font-bold">
-                <p class="text-3xl text-primary-700">
-                    <slot name="label">{{ label }}</slot>
-                </p>
+                <p class="text-3xl"> {{ label }} </p>
             </div>
         </div>
         </NuxtLink>
+
+
 </template>
 
 <script setup lang="ts">
@@ -27,3 +27,4 @@ const props = defineProps<{
     label: string
 }>()
 </script>
+

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

@@ -1,24 +1,21 @@
 <template>
     <div
         v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
-        class="flex flex-col gap-16">
-        <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des races réceptionnées</h1>
+        class="flex flex-col items-center gap-16">
+        <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
         <div
-            class="flex flex-row gap-8 items-center w-full">
+            class="flex flex-row gap-8 items-center">
             <div
                 v-for="type in bovineType"
                 :key="type.id"
-                class="mt-8 flex flex-row mb-2 w-full">
+                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)]"
                     :placeholder="0"
                     :min="0"
                     :max="10"
-                    class="max-w-[150px]"
-                    wrapper-class="gap-3"
                 />
             </div>
             <div
@@ -26,19 +23,14 @@
                 <UiNumberInput
                     label="Autres"
                     v-model="otherQuantity"
-                    class="max-w-[80px]"
-                    wrapper-class="gap-3"
                 />
             </div>
         </div>
-        <div class="flex justify-center">
-            <UiButton
-                type="submit"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-                @click="goNext"
-            >Valider
-            </UiButton>
-        </div>
+        <button
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="goNext"
+        >Valider
+        </button>
     </div>
 </template>
 <script setup lang="ts">
@@ -85,14 +77,14 @@ onMounted(async () => {
 })
 
 watch(
-    [() => receptionId.value, () => bovineType.value],
-    async ([id, types]) => {
-        if (!id || !receptionIri.value || types.length === 0) {
+    () => receptionId.value,
+    async (id) => {
+        if (!id || !receptionIri.value) {
             return
         }
 
         const selectionMap: Record<string, number | null> = {}
-        for (const type of types) {
+        for (const type of bovineType.value) {
             selectionMap[String(type.id)] = 0
         }
 

frontend/components/reception/reception-form.vue

@@ -1,7 +1,7 @@
 <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 text-primary-500">Réception</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Réception</h1>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="reception-user"
@@ -81,8 +81,20 @@
                 select-class="h-[34px]"
                 wrapper-class="col-start-2 row-start-3"
             />
+            <!--    Chauffeur (LIOT)        -->
+            <UiSelect
+                id="reception-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
+                wrapper-class="col-start-2 row-start-4"
+            />
             <!--    Plaque d'immatriculation       -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
                 <UiLicensePlateInput
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
@@ -100,28 +112,15 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
-                wrapper-class="col-start-2 row-start-4 h-[64px]"
-            />
-            <!--    Chauffeur (LIOT)        -->
-            <UiSelect
-                id="reception-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
-                v-if="isLiotCarrier"
                 wrapper-class="col-start-2 row-start-5"
             />
         </div>
         <div class="flex justify-center">
-            <UiButton
+            <button
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </UiButton>
+            </button>
         </div>
     </form>
 

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

@@ -3,7 +3,7 @@
         <div
             v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
             class="flex flex-col gap-16 items-center w-full">
-            <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des marchandises réceptionnnées</h1>
+            <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
             <UiSelect
                 id="merchandise-type"
                 v-model="selectedMerchandiseTypeId"
@@ -26,7 +26,7 @@
 
             <div
                 v-if="selectedMerchandiseTypeId && !isGranule"
-                class="flex gap-4 w-[550px] justify-between"
+                class="flex gap-4 w-[550px] justify-evenly"
             >
                 <div
                     v-for="building in buildings"
@@ -47,31 +47,28 @@
             >
                 <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
                     <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
-                        <p class="font-bold uppercase text-primary-500">{{ type.label }}</p>
+                        <p class="font-bold uppercase">{{ type.label }}</p>
                         <div
                             v-for="building in buildings"
                             :key="building.id"
-                            class="flex items-center gap-2 text-lg pl-[2px]"
+                            class="flex items-center gap-2 text-lg"
                         >
                             <UiCheckbox
                                 v-model="selectedPelletBuildingIds[String(type.id)]"
                                 :value="String(building.id)"
                                 :label="building.label"
-                                label-class="text-xl"
+                                label-class="text-lg"
                             />
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-        <div class="flex justify-center">
-            <UiButton
-                type="submit"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-                @click="goNext"
-            >Valider
-            </UiButton>
-        </div>
+        <button
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="goNext"
+        >Valider
+        </button>
     </div>
 </template>
 

frontend/components/reception/reception-weight.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
+            <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 text-primary-500 mt-2">Pont-bascule connecté</p>
+            <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]">
@@ -11,27 +11,27 @@
             </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 text-primary-500">
+                    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]">
-        <UiButton
+        <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
-        <UiButton
+        >{{ 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</UiButton>
-        <UiButton
+        >Valider</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</UiButton>
+        >Générer le bon</button>
     </div>
 </template>
 

frontend/components/reception/update-bovin.vue

@@ -1,161 +1,183 @@
 <template>
-    <form>
-        <div class="flex flex-row justify-between gap-x-12 font-bold uppercase mb-8">
+    <form @submit.prevent="validate">
+    <div
+        class="flex flex-col items-center gap-16">
+        <div
+            class="flex flex-row gap-6 items-center">
             <div
-                v-for="type in bovineTypes"
+                v-for="type in bovineType"
                 :key="type.id"
-            >
+                class="flex flex-row mb-2 gap-6 ">
                 <UiNumberInput
                     :label="type.label"
                     :code="type.code"
-                    v-model="localQuantities[String(type.id)]"
-                    :disabled="!isAdmin"
+                    v-model="bovineQuantities[String(type.id)]"
+                    :disabled="!auth.isAdmin"
                     :placeholder="0"
                     :min="0"
                     :max="10"
-                    wrapperClass="w-44 flex-col"
-                    inputClass="font-medium"
                 />
             </div>
-            <UiNumberInput
-                label="Autres"
-                v-model="localOtherQuantity"
-                :disabled="!isAdmin"
-                wrapperClass="w-44 flex-col"
-                inputClass="font-medium"
-            />
+            <div
+                class=" flex flex-row mb-2 gap-6">
+                <UiNumberInput
+                    label="Autres"
+                    v-model="otherQuantity"
+                    :disabled="!auth.isAdmin"
+                />
+            </div>
         </div>
+        <button
+            type="submit"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            :disabled="!auth.isAdmin"
+        >Valider
+        </button>
+    </div>
     </form>
 </template>
-
 <script setup lang="ts">
-import { onMounted, reactive, ref, watch } from 'vue'
-import { getBovineTypeList } from '~/services/bovine-type'
-import type { BovineTypeData } from '~/services/dto/bovine-type-data'
-import type { ReceptionBovineTypeData } from '~/services/dto/reception-bovine-data'
-
+import type {BovineTypeData} from "~/services/dto/bovine-type-data";
+import {getBovineTypeList} from "~/services/bovine-type";
+import {
+    createReceptionBovine,
+    deleteReceptionBovine,
+    getReceptionBovineList,
+    updateReceptionBovine
+} from "~/services/reception-bovine";
+import {computed, onMounted, reactive, ref, watch} from "vue";
+import {getReception, updateReception} from "~/services/reception";
+const toast = useToast()
+const isLoadingBovineType = ref(false)
+const bovineType = ref<BovineTypeData[]>([])
+const bovineQuantities = reactive<Record<string, number | null>>({})
+const otherQuantity = ref<number | null>(0)
+const auth = useAuthStore()
 const props = defineProps<{
-    modelValue: ReceptionBovineTypeData[]
-    otherQuantity: number | null
-    isAdmin: boolean
+    idReception: number
 }>()
+const receptionId = props.idReception
+const reception = await getReception(receptionId)
 
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: ReceptionBovineTypeData[]): void
-    (event: 'update:otherQuantity', value: number | null): void
-}>()
+const receptionIri = computed(() =>
+    receptionId ? `/api/receptions/${receptionId}` : null
+)
+const totalBovines = computed(() => {
+    const base = Object.values(bovineQuantities).reduce((sum, value) => {
+        return sum + (value ?? 0)
+    }, 0)
+    return base + (otherQuantity.value ?? 0)
+})
 
-const bovineTypes = ref<BovineTypeData[]>([])
-const localQuantities = reactive<Record<string, number | null>>({})
-const localOtherQuantity = ref<number | null>(props.otherQuantity ?? 0)
-// Verrou pour éviter les boucles props -> local -> emit -> props.
-const isSyncing = ref(false)
-
-function entriesEqualByTypeAndQuantity(
-    left: ReceptionBovineTypeData[],
-    right: ReceptionBovineTypeData[]
-): boolean {
-    const toMap = (entries: ReceptionBovineTypeData[]) => {
-        const map = new Map<number, number>()
-        for (const entry of entries) {
-            const typeId = entry.bovineType?.id ?? 0
-            map.set(typeId, entry.quantity ?? 0)
-        }
-
-        return map
-    }
-
-    const a = toMap(left)
-    const b = toMap(right)
-    if (a.size !== b.size) {
-        return false
-    }
-
-    for (const [typeId, quantity] of a.entries()) {
-        if ((b.get(typeId) ?? 0) !== quantity) {
-            return false
-        }
-    }
-
-    return true
-}
-
-function buildEntriesFromLocal(): ReceptionBovineTypeData[] {
-    return bovineTypes.value.map((type) => {
-        const existing = props.modelValue.find((entry) => entry.bovineType.id === type.id)
-        return {
-            id: existing?.id ?? 0,
-            bovineType: type,
-            quantity: localQuantities[String(type.id)] ?? 0
-        }
-    })
-}
-
-function syncLocalFromProps() {
-    isSyncing.value = true
+const loadBovineType = async () => {
+    isLoadingBovineType.value = true
     try {
-        for (const key of Object.keys(localQuantities)) {
-            delete localQuantities[key]
-        }
-
-        for (const type of bovineTypes.value) {
-            const existing = props.modelValue.find((entry) => entry.bovineType.id === type.id)
-            localQuantities[String(type.id)] = existing?.quantity ?? 0
-        }
+        bovineType.value = await getBovineTypeList()
     } finally {
-        isSyncing.value = false
+        isLoadingBovineType.value = false
     }
 }
 
+onMounted(async () => {
+    await loadBovineType()
+})
+
 watch(
-    () => props.otherQuantity,
-    (value) => {
-        if (isSyncing.value) {
+    () => receptionId,
+    async (id) => {
+        if (!id || !receptionIri.value) {
             return
         }
 
-        const next = value ?? 0
-        isSyncing.value = true
-        localOtherQuantity.value = next
-        isSyncing.value = false
-    }
+        const selectionMap: Record<string, number | null> = {}
+        for (const type of bovineType.value) {
+            selectionMap[String(type.id)] = 0
+        }
+
+        const existing = await getReceptionBovineList(receptionIri.value)
+        for (const selection of existing) {
+            const bovineTypeId = String(selection.bovineType.id)
+            selectionMap[bovineTypeId] = selection.quantity ?? 0
+        }
+
+        for (const key of Object.keys(bovineQuantities)) {
+            delete bovineQuantities[key]
+        }
+        Object.assign(bovineQuantities, selectionMap)
+
+        const existingOther = await reception.bovineDetail
+        const parsedOther =
+            typeof existingOther === 'string' && existingOther.trim() !== ''
+                ? Number(existingOther)
+                : 0
+        otherQuantity.value = Number.isFinite(parsedOther) ? parsedOther : 0
+    },
+    {immediate: true}
 )
 
-watch(localOtherQuantity, (value) => {
-    if (isSyncing.value) {
+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, {
+            id: selection.id,
+            quantity: selection.quantity ?? 0
+        })
+    }
+
+    // Supprime les entrées supprimées ou modifiées
+    for (const [bovineTypeId, entry] of existingMap.entries()) {
+        const selectedQuantity = bovineQuantities[bovineTypeId] ?? 0
+        if (!selectedQuantity) {
+            await deleteReceptionBovine(entry.id)
+            existingMap.delete(bovineTypeId)
+            continue
+        }
+
+        if (selectedQuantity !== entry.quantity) {
+            await updateReceptionBovine(entry.id, {quantity: selectedQuantity})
+            existingMap.set(bovineTypeId, {
+                id: entry.id,
+                quantity: selectedQuantity
+            })
+        }
+    }
+
+    // Crée les entrées manquantes
+    for (const [bovineTypeId, quantity] of Object.entries(bovineQuantities)) {
+        if (!quantity) {
+            continue
+        }
+        if (existingMap.has(bovineTypeId)) {
+            // Déjà à jour
+            continue
+        }
+        await createReceptionBovine({
+            reception: receptionIri,
+            bovineType: `/api/bovine_types/${bovineTypeId}`,
+            quantity
+        })
+    }
+}
+
+async function validate() {
+    // @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 next = value ?? 0
-    emit('update:otherQuantity', next)
-})
+    await syncBovineSelections(receptionIri.value)
 
-watch(
-    () => props.modelValue,
-    () => {
-        // Hydratation locale uniquement quand le parent change.
-        syncLocalFromProps()
-    },
-    { immediate: true }
-)
-
-watch(
-    localQuantities,
-    () => {
-        if (isSyncing.value) {
-            return
-        }
-        // N'émet que si les quantités diffèrent réellement du parent.
-        const nextEntries = buildEntriesFromLocal()
-        if (!entriesEqualByTypeAndQuantity(nextEntries, props.modelValue)) {
-            emit('update:modelValue', nextEntries)
-        }
-    },
-    { deep: true }
-)
-
-onMounted(async () => {
-    bovineTypes.value = await getBovineTypeList()
-    syncLocalFromProps()
-})
+    await updateReception(receptionId, {
+        merchandiseType: null,
+        merchandiseDetail: null,
+        bovineDetail: otherQuantity.value ? String(otherQuantity.value) : null,
+    })
+}
 </script>

frontend/components/reception/update-merchandise.vue

@@ -1,27 +1,33 @@
 <template>
-    <form>
-        <div class="flex flex-col">
-            <div class="w-full col-start-1 row-start-1">
-                <UiRadioGroup
+    <form @submit.prevent="validate">
+        <div class="flex flex-col items-center gap-16">
+            <div
+                class="flex flex-col gap-16 items-center w-full">
+                <UiTextInput
                     id="merchandise-type"
                     v-model="selectedMerchandiseTypeId"
                     label="Type de marchandises"
-                    :options="merchandiseTypes.map((type) => ({
-                        value: String(type.id),
-                        label: type.label
-                    }))"
-                    input-class="accent-primary-700 focus:ring-primary-700"
-                    option-label-class="uppercase"
-                    wrapper-class="w-full uppercase"
-                    group-class="grid grid-cols-[336px_336px_355px_200px] w-[160px_160px_200px_180px] mt-9 mb-7"
-                    :disabled="!isAdmin"
+                    :value="reception.merchandiseType?.label"
+                    wrapper-class="w-[550px]"
+                    :disabled="true"
                 />
-            </div>
-
-            <div class="w-full grid grid-cols-[3fr_1fr] gap-12 col-start-2 row-start-1">
                 <div
-                    v-if="selectedMerchandiseTypeId && !isGranule"
-                    class="flex gap-[218px]"
+                    v-if="merchandiseTypeId && isAutres"
+                    class="flex flex-col w-full max-w-[550px]"
+                >
+                    <UiTextInput
+                        id="merchandise-detail"
+                        :disabled="!auth.isAdmin"
+                        v-model="merchandiseDetail"
+                        label="Préciser"
+                        placeholder="Précisions complémentaires"
+                        :maxlength="255"
+                    />
+                </div>
+
+                <div
+                    v-if="merchandiseTypeId && !isGranule"
+                    class="flex gap-4 w-[550px] justify-evenly"
                 >
                     <div
                         v-for="building in buildings"
@@ -31,228 +37,112 @@
                             v-model="selectedBuildingIds"
                             :value="String(building.id)"
                             :label="building.label"
-                            :disabled="!isAdmin"
-                            input-class="accent-primary-700 focus:ring-primary-700"
-                            label-class="text-xl uppercase"
+                            :disabled="!auth.isAdmin"
+                            label-class="text-xl"
                         />
                     </div>
                 </div>
 
                 <div
-                    v-if="selectedMerchandiseTypeId && isAutres"
-                    class="flex flex-col justify-self-end max-w-[182px]"
+                    v-if="merchandiseTypeId && isGranule"
+                    class="flex flex-col gap-10 w-full max-w-[1100px]"
                 >
-                    <UiTextInput
-                        id="merchandise-detail"
-                        :disabled="!isAdmin"
-                        v-model="merchandiseDetail"
-                        placeholder="Préciser"
-                        :maxlength="255"
-                        class="h-6"
-                    />
-                </div>
-            </div>
-
-            <div
-                v-if="selectedMerchandiseTypeId && isGranule"
-                class="flex flex-col gap-10 w-full col-start-2 row-start-1"
-            >
-                <div class="grid grid-cols-1 md:grid-cols-[max-content_max-content_max-content_max-content] justify-between">
-                    <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
-                        <p class="mb-1 font-medium uppercase">{{ type.label }}</p>
-                        <div
-                            v-for="building in buildings"
-                            :key="building.id"
-                            class="flex text-lg"
-                        >
-                            <UiCheckbox
-                                v-model="selectedPelletBuildingIds[String(type.id)]"
-                                :value="String(building.id)"
-                                :label="building.label"
-                                :disabled="!isAdmin"
-                                input-class="accent-primary-700 focus:ring-primary-700"
-                                label-class="text-lg"
-                            />
+                    <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
+                        <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
+                            <p class="font-bold uppercase">{{ type.label }}</p>
+                            <div
+                                v-for="building in buildings"
+                                :key="building.id"
+                                class="flex items-center gap-2 text-lg"
+                            >
+                                <UiCheckbox
+                                    v-model="selectedPelletBuildingIds[String(type.id)]"
+                                    :value="String(building.id)"
+                                    :label="building.label"
+                                    :disabled="!auth.isAdmin"
+                                    label-class="text-lg"
+                                />
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
+            <button
+                v-if="auth.isAdmin"
+                type="submit"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                :disabled="!auth.isAdmin"
+            >Valider
+            </button>
         </div>
     </form>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
-import type { BuildingData } from '~/services/dto/building-data'
-import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
-import type { PelletTypeData } from '~/services/dto/pellet-type-data'
-import type { MerchandiseEntryData } from '~/services/dto/reception-data'
-import { getBuildingList } from '~/services/building'
-import { getMerchandiseTypeList } from '~/services/merchandise-type'
-import { getPelletTypeList } from '~/services/pellet-type'
-import { MERCHANDISE_TYPE_CODES } from '~/utils/constants'
-
-const props = defineProps<{
-    modelValue: MerchandiseEntryData
-    isAdmin: boolean
-}>()
-
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: MerchandiseEntryData): void
-}>()
+import {computed, onMounted, ref} from 'vue'
+import {getBuildingList} from '~/services/building'
+import {getMerchandiseTypeList} from '~/services/merchandise-type'
+import type {MerchandiseTypeData} from '~/services/dto/merchandise-type-data'
+import type {BuildingData} from '~/services/dto/building-data'
+import type {PelletTypeData} from '~/services/dto/pellet-type-data'
+import {getPelletTypeList} from '~/services/pellet-type'
+import {
+    createReceptionPelletBuilding,
+    deleteReceptionPelletBuilding,
+    getReceptionPelletBuildingList
+} from '~/services/reception-pellet-building'
+import {MERCHANDISE_TYPE_CODES} from '~/utils/constants'
+import {getReception, updateReception} from "~/services/reception";
 
 const merchandiseTypes = ref<MerchandiseTypeData[]>([])
 const buildings = ref<BuildingData[]>([])
 const pelletTypes = ref<PelletTypeData[]>([])
-
 const selectedMerchandiseTypeId = ref('')
 const selectedBuildingIds = ref<string[]>([])
 const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
 const merchandiseDetail = ref('')
-// Verrou de synchro pour empêcher les aller-retours infinis entre parent et composant.
-const isSyncing = ref(false)
-const isReady = ref(false)
+const auth = useAuthStore()
+const props = defineProps<{
+    idReception: number
+}>()
+const receptionId = props.idReception
+const reception = await getReception(receptionId)
+const merchandiseTypeId = await reception.receptionType?.id
 
+// Extrait l'ID d'une relation depuis un IRI ou un objet complet.
+const getRelationId = (value: unknown): string | null => {
+    if (!value) {
+        return null
+    }
+
+    if (typeof value === 'string') {
+        const match = value.match(/\/(\d+)$/)
+        return match ? match[1] : null
+    }
+
+    if (typeof value === 'object' && 'id' in value) {
+        const record = value as { id?: number | string }
+        if (typeof record.id === 'number') {
+            return String(record.id)
+        }
+        if (typeof record.id === 'string') {
+            return record.id
+        }
+    }
+
+    return null
+}
+
+// Type de marchandise sélectionné dans le select
 const selectedMerchandiseType = computed(() =>
-    merchandiseTypes.value.find((type) => String(type.id) === selectedMerchandiseTypeId.value) ?? null
-)
-const isGranule = computed(
-    () => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.GRANULE
-)
-const isAutres = computed(
-    () => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.AUTRES
-)
-
-function clonePelletSelections(value: Record<string, string[]>) {
-    const clone: Record<string, string[]> = {}
-    for (const [key, buildingIds] of Object.entries(value)) {
-        clone[key] = [...buildingIds]
-    }
-    return clone
-}
-
-function sorted(values: string[]): string[] {
-    return [...values].sort()
-}
-
-function normalizeModel(value: MerchandiseEntryData): MerchandiseEntryData {
-    // Normalisation stable pour comparer deux modèles sans faux positifs (ordre des tableaux).
-    const pellet: Record<string, string[]> = {}
-    const pelletKeys = Object.keys(value.selectedPelletBuildingIds ?? {}).sort()
-    for (const key of pelletKeys) {
-        pellet[key] = sorted(value.selectedPelletBuildingIds[key] ?? [])
-    }
-
-    return {
-        merchandiseTypeId: value.merchandiseTypeId ?? '',
-        merchandiseDetail: value.merchandiseDetail ?? '',
-        selectedBuildingIds: sorted(value.selectedBuildingIds ?? []),
-        selectedPelletBuildingIds: pellet
-    }
-}
-
-function buildCurrentModel(): MerchandiseEntryData {
-    return {
-        merchandiseTypeId: selectedMerchandiseTypeId.value,
-        merchandiseDetail: merchandiseDetail.value,
-        selectedBuildingIds: [...selectedBuildingIds.value],
-        selectedPelletBuildingIds: clonePelletSelections(selectedPelletBuildingIds.value)
-    }
-}
-
-function isSameModel(left: MerchandiseEntryData, right: MerchandiseEntryData): boolean {
-    return JSON.stringify(normalizeModel(left)) === JSON.stringify(normalizeModel(right))
-}
-
-function ensurePelletKeys() {
-    for (const pelletType of pelletTypes.value) {
-        const key = String(pelletType.id)
-        if (!selectedPelletBuildingIds.value[key]) {
-            selectedPelletBuildingIds.value[key] = []
-        }
-    }
-}
-
-function hydrateFromModelValue(value: MerchandiseEntryData) {
-    isSyncing.value = true
-    try {
-        selectedMerchandiseTypeId.value = value.merchandiseTypeId ?? ''
-        merchandiseDetail.value = value.merchandiseDetail ?? ''
-        selectedBuildingIds.value = [...(value.selectedBuildingIds ?? [])]
-        selectedPelletBuildingIds.value = clonePelletSelections(
-            value.selectedPelletBuildingIds ?? {}
-        )
-        ensurePelletKeys()
-    } finally {
-        isSyncing.value = false
-    }
-}
-
-function sanitizeLocalState() {
-    if (isGranule.value) {
-        if (selectedBuildingIds.value.length > 0) {
-            selectedBuildingIds.value = []
-        }
-    } else {
-        for (const key of Object.keys(selectedPelletBuildingIds.value)) {
-            if (selectedPelletBuildingIds.value[key].length > 0) {
-                selectedPelletBuildingIds.value[key] = []
-            }
-        }
-    }
-
-    if (!isAutres.value && merchandiseDetail.value !== '') {
-        merchandiseDetail.value = ''
-    }
-}
-
-function emitCurrentModel() {
-    const currentModel = buildCurrentModel()
-    // Ne pas réémettre si rien n'a changé côté métier.
-    if (isSameModel(currentModel, props.modelValue)) {
-        return
-    }
-
-    emit('update:modelValue', currentModel)
-}
-
-watch(
-    () => props.modelValue,
-    (value) => {
-        const currentModel = buildCurrentModel()
-        // Si local == parent, on ignore pour éviter la boucle de réhydratation.
-        if (isSameModel(currentModel, value)) {
-            return
-        }
-        hydrateFromModelValue(value)
-    },
-    { immediate: true }
-)
-
-watch(
-    [selectedMerchandiseTypeId, selectedBuildingIds, selectedPelletBuildingIds, merchandiseDetail],
-    () => {
-        if (isSyncing.value || !isReady.value) {
-            return
-        }
-
-        const beforeSanitize = buildCurrentModel()
-        isSyncing.value = true
-        // Applique les règles métier (granulé / autres) avant émission.
-        sanitizeLocalState()
-        isSyncing.value = false
-
-        const afterSanitize = buildCurrentModel()
-        // Si la sanitation a modifié l'état, on laisse le watcher repasser proprement.
-        if (!isSameModel(beforeSanitize, afterSanitize)) {
-            return
-        }
-
-        emitCurrentModel()
-    },
-    { deep: true }
+    merchandiseTypes.value.find((type) => String(type.id) === selectedMerchandiseTypeId.value)
 )
+// Indique si le type est "Granulé"
+const isGranule = computed(() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.GRANULE)
+// Indique si le type est "Autres"
+const isAutres = computed(() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.AUTRES)
 
+// Charge les référentiels et hydrate le formulaire depuis la réception
 onMounted(async () => {
     const [merchandiseTypeList, buildingList, pelletTypeList] = await Promise.all([
         getMerchandiseTypeList(),
@@ -263,7 +153,106 @@ onMounted(async () => {
     buildings.value = buildingList
     pelletTypes.value = pelletTypeList
 
-    hydrateFromModelValue(props.modelValue)
-    isReady.value = true
+    const currentId = reception.merchandiseType?.id
+    if (currentId) {
+        selectedMerchandiseTypeId.value = String(currentId)
+    }
+    merchandiseDetail.value = reception.merchandiseDetail ?? ''
+
+    selectedBuildingIds.value =
+        reception.buildings?.map((building) => String(building.id)) ?? []
+
+    const existingPelletSelections = reception.pelletBuildings ?? []
+    const selectionMap: Record<string, string[]> = {}
+    for (const selection of existingPelletSelections) {
+        // L'API peut renvoyer les relations comme IRI ou comme objets selon le contexte.
+        const pelletTypeId = getRelationId(selection.pelletType)
+        const buildingId = getRelationId(selection.building)
+        if (!pelletTypeId || !buildingId) {
+            continue
+        }
+        if (!selectionMap[pelletTypeId]) {
+            selectionMap[pelletTypeId] = []
+        }
+        selectionMap[pelletTypeId].push(buildingId)
+    }
+    for (const pelletType of pelletTypes.value) {
+        const key = String(pelletType.id)
+        if (!selectionMap[key]) {
+            selectionMap[key] = []
+        }
+    }
+    selectedPelletBuildingIds.value = selectionMap
 })
+// Enregistre les sélections et passe à l'étape suivante
+async function validate() {
+
+    const receptionIri = `/api/receptions/${reception.id}`
+
+    await updateReception(reception.id, {
+        merchandiseDetail: isAutres.value ? merchandiseDetail.value.trim() : null,
+        buildings: isGranule.value
+            ? []
+            : selectedBuildingIds.value.map((id) => `/api/buildings/${id}`),
+        bovineDetail: null,
+        bovinesTypes: null,
+    })
+
+    if (isGranule.value) {
+        await syncPelletSelections(receptionIri)
+    } else {
+        await clearPelletSelections(receptionIri)
+    }
+}
+
+// Supprime toutes les associations granulés/bâtiments existantes
+async function clearPelletSelections(receptionIri: string) {
+    const existing = await getReceptionPelletBuildingList(receptionIri)
+    for (const selection of existing) {
+        await deleteReceptionPelletBuilding(selection.id)
+    }
+}
+// Synchronise les associations granulés/bâtiments avec l'état du formulaire
+async function syncPelletSelections(receptionIri: string) {
+    const existing = await getReceptionPelletBuildingList(receptionIri)
+    const existingMap = new Map<string, number>()
+    for (const selection of existing) {
+        // Construit la table de correspondance avec des IDs normalisés pour éviter les doublons.
+        const pelletTypeId = getRelationId(selection.pelletType)
+        const buildingId = getRelationId(selection.building)
+        if (!pelletTypeId || !buildingId) {
+            continue
+        }
+        const key = `${pelletTypeId}:${buildingId}`
+        existingMap.set(key, selection.id)
+    }
+
+    const desiredEntries: Array<{ pelletTypeId: string; buildingId: string }> = []
+    for (const [pelletTypeId, buildingIds] of Object.entries(selectedPelletBuildingIds.value)) {
+        for (const buildingId of buildingIds) {
+            desiredEntries.push({pelletTypeId, buildingId})
+        }
+    }
+
+    const desiredKeys = new Set(desiredEntries.map(
+        (entry) => `${entry.pelletTypeId}:${entry.buildingId}`
+    ))
+
+    for (const [key, id] of existingMap.entries()) {
+        if (!desiredKeys.has(key)) {
+            await deleteReceptionPelletBuilding(id)
+        }
+    }
+
+    for (const entry of desiredEntries) {
+        const key = `${entry.pelletTypeId}:${entry.buildingId}`
+        if (!existingMap.has(key)) {
+            await createReceptionPelletBuilding({
+                reception: receptionIri,
+                pelletType: `/api/pellet_types/${entry.pelletTypeId}`,
+                building: `/api/buildings/${entry.buildingId}`
+            })
+        }
+    }
+}
 </script>

frontend/components/reception/update-weight.vue

@@ -1,63 +1,120 @@
 <template>
-    <form>
-        <div class="grid grid-cols-3 gap-x-40 gap-y-8 mb-8">
-            <UiNumberInput
-                :key="localWeight.type"
-                :label="'POIDS'"
-                labelClass="font-bold uppercase text-xl "
-                v-model="localWeight.weight"
-                :disabled="!isAdmin"
-                :min="0"
-                :max="48000"
-                wrapper-class="flex-col"
-            />
-
-            <UiDateInput
-                label="Date pesée"
-                v-model="localWeight.weighedAt"
-                :disabled="!isAdmin"
-            />
-
-            <UiNumberInput
+    <form @submit.prevent="validate">
+        <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-8">
+            <UiTextInput
                 label="Dsd"
                 class="col-start-2"
-                labelClass="font-bold uppercase"
-                v-model="localWeight.dsd"
-                :disabled="!isAdmin"
-                wrapper-class="flex-col"
+                v-model="sharedWeightMeta.dsd"
+                :disabled="!auth.isAdmin"
+            />
+            <UiDateInput
+                label="Date pesée"
+                v-model="sharedWeightMeta.weighedAt"
+                :disabled="!auth.isAdmin"
             />
         </div>
+        <div class="grid grid-cols-2 gap-x-40 mb-16">
+            <UiNumberInput
+                v-for="weight in form.weights"
+                :key="weight.type"
+                :label="getWeightLabel(weight.type)"
+                labelClass="font-bold uppercase text-xl"
+                v-model="weight.weight"
+                :wrapper-class="weight.type === 'tare' ? 'col-start-1 row-start-1' : 'col-start-2 row-start-1'"
+                :disabled="!auth.isAdmin"
+            />
+        </div>
+
+        <div class="flex justify-center">
+            <button
+                v-if="auth.isAdmin"
+                type="submit"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+
+            >
+                Valider
+            </button>
+        </div>
+
     </form>
 </template>
 
 <script setup lang="ts">
-import type {WeightEntryData} from '~/services/dto/reception-data'
-import {reactive, watch} from "vue";
+import type {ReceptionFormWeight} from '~/services/dto/reception-data'
+import {getReception} from '~/services/reception'
+import {updateWeight} from "~/services/weight";
+import {useAuthStore} from "~/stores/auth";
 
 const props = defineProps<{
-    modelValue: WeightEntryData
-    isAdmin: boolean
+    idReception: number
 }>()
 
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: WeightEntryData): void
-}>()
+const idReception = props.idReception
+const auth = useAuthStore()
 
-const localWeight = reactive<WeightEntryData>({...props.modelValue})
+const form = reactive({
+    weights: [
+        {id: 0, type: 'tare' as const, weight: 0, dsd: null, weighedAt: null},
+        {id: 0, type: 'gross' as const, weight: 0, dsd: null, weighedAt: null}
+    ]
+})
+// DSD et date de pesée sont partagés entre tare et gross dans l'UI.
+const sharedWeightMeta = reactive<{
+    dsd: number | string | null
+    weighedAt: string | null
+}>({
+    dsd: null,
+    weighedAt: null
+})
 
-watch(
-    () => props.modelValue,
-    (value) => {
-        Object.assign(localWeight, value)
-    },
-    {deep: true}
-)
+const getWeightLabel = (type: 'tare' | 'gross'): string => {
+    return type === 'tare' ? 'Pesée à vide' : 'Pesée à plein'
+}
 
-watch(
-    localWeight,
-    (value) => {
-        emit('update:modelValue', {...value})
-    },
-    {deep: true}
-)
+const hydrateFromReception = (reception: ReceptionFormWeight) => {
+    // On hydrate chaque ligne par son type (tare/gross), sans dépendre d'un index.
+    for (const receptionWeight of reception.weights) {
+        const formWeight = form.weights.find(weight => weight.type === receptionWeight.type)
+        if (formWeight) {
+            Object.assign(formWeight, receptionWeight)
+        }
+    }
+
+    // On récupère une valeur existante pour préremplir les champs partagés.
+    const weightWithMeta = reception.weights.find(weight =>
+        (weight.dsd !== null && weight.dsd !== undefined)
+        || (weight.weighedAt !== null && weight.weighedAt !== undefined && weight.weighedAt !== '')
+    )
+
+    if (weightWithMeta) {
+        sharedWeightMeta.dsd = weightWithMeta.dsd ?? null
+        sharedWeightMeta.weighedAt = weightWithMeta.weighedAt ?? null
+    }
+}
+
+onMounted(async () => {
+    const reception = await getReception(idReception)
+    hydrateFromReception(reception)
+})
+
+async function validate() {
+    const sharedDsd =
+        sharedWeightMeta.dsd === null || sharedWeightMeta.dsd === undefined || sharedWeightMeta.dsd === ''
+            ? null
+            : Number(sharedWeightMeta.dsd)
+    const sharedWeighedAt =
+        sharedWeightMeta.weighedAt === null || sharedWeightMeta.weighedAt === undefined || sharedWeightMeta.weighedAt === ''
+            ? null
+            : sharedWeightMeta.weighedAt
+    for (const weight of form.weights) {
+        if (weight.id) {
+            await updateWeight(weight.id, {
+                weight: weight.weight,
+                dsd: Number.isFinite(sharedDsd) ? sharedDsd : null,
+                weighedAt: sharedWeighedAt
+            })
+        }
+    }
+
+}
 </script>

frontend/components/shipment/shipment-form.vue

@@ -1,7 +1,7 @@
 <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 text-primary-500">Expédition</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"
@@ -22,27 +22,24 @@
                 wrapper-class="col-start-1 row-start-3"
             />
             <!--    Type d'expédition        -->
-            <div class="col-start-1 row-start-4 h-[64px]">
-                <div class="flex items-end gap-8 justify-between">
-                    <UiRadioGroup
-                        id="shipment-type"
-                        name="shipment-type"
-                        label="Type d'expédition bovine"
-                        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 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>
             </div>
             <!--    Client        -->
@@ -52,7 +49,7 @@
                 label="Client"
                 :options="customers.map((customer) => ({
                     value: String(customer.id),
-                    label: customer.name || `Client #${customer.id}`
+                    label: customer.label
                 }))"
                 :loading="isLoadingCustomers"
                 wrapper-class="col-start-1 row-start-5"
@@ -89,10 +86,22 @@
                 }))"
                 wrapper-class="col-start-2 row-start-3"
             />
+            <!--  Chauffeur (LIOT)        -->
+            <UiSelect
+                id="shipment-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :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-4">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
                 <UiLicensePlateInput
-                    v-model="form.licensePlate"
+                    v-model="form.licencePlate"
                     v-model:allowAny="allowAnyLicensePlate"
                 />
             </div>
@@ -108,28 +117,15 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
-                wrapper-class="col-start-2 row-start-4"
-            />
-            <!--  Chauffeur (LIOT)        -->
-            <UiSelect
-                id="shipment-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-5"
-                v-if="isLiotCarrier"
             />
         </div>
         <div class="flex justify-center">
-            <UiButton
+            <button
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </UiButton>
+            </button>
         </div>
     </form>
 </template>
@@ -152,9 +148,15 @@ import type {ShipmentFormData} from '~/services/dto/shipment-data'
 import {SUPPLIER_CODE} from "~/utils/constants"
 import {useAuthStore} from '~/stores/auth'
 import {useShipmentStore} from '~/stores/shipment'
-import {computed, reactive, ref, watch, onMounted} 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 {
+    createShipmentBovine,
+    deleteShipmentBovine,
+    getBovinShipmentList,
+    updateShipmentBovine
+} from "~/services/bovin-shipment";
 
 const users = ref<UserData[]>([])
 const customers = ref<CustomerData[]>([])
@@ -175,9 +177,8 @@ 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
@@ -193,7 +194,7 @@ const form = reactive<ShipmentFormData>({
     carrierId: '',
     driverId: '',
     vehicleId: '',
-    licensePlate: '',
+    licencePlate: '',
 })
 // Adresses liées au client sélectionné
 const customerAddresses = computed<AddressData[]>(() => {
@@ -315,7 +316,7 @@ watch(
     () => shipmentStore.current,
     (shipment) => {
         isHydrating.value = true
-        form.licensePlate = shipment?.licensePlate ?? ''
+        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
@@ -326,15 +327,17 @@ watch(
         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) : ''
-
-
-        selectedShipmentTypeId.value = shipment?.shipmentType?.id
-            ? String(shipment.shipmentType.id)
-            : ''
-
-        shipmentQuantity.value = shipment?.nbBovinSend ?? 0
-
-
+        if (!shipment || !shipment.bovinShipments) {
+            bovineQuantities.value = {}
+        } 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
+            }
+            bovineQuantities.value = next
+        }
         isHydrating.value = false
     },
     {immediate: true}
@@ -441,28 +444,83 @@ watch(
             (vehicle) => String(vehicle.id) === form.vehicleId
         )
         if (selected) {
-            form.licensePlate = selected.plate
+            form.licencePlate = selected.plate
             allowAnyLicensePlate.value = false
         }
     }
 )
 watch(
-    () => [form.licensePlate, form.carrierId, vehicles.value],
+    () => [form.licencePlate, form.carrierId, vehicles.value],
     () => {
         if (!isLiotCarrier.value || form.vehicleId) {
             return
         }
         const match = filteredVehicles.value.find(
-            (vehicle) => vehicle.plate === form.licensePlate
+            (vehicle) => vehicle.plate === form.licencePlate
         )
         if (match) {
             form.vehicleId = String(match.id)
         }
     }
 )
+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 syncBovinShipments = async (
+    shipmentId: number,
+    existing: Array<{ id?: number; nbBovinSend: number | null; shipmentType?: unknown }> = []
+) => {
+    const shipmentIri = `/api/shipments/${shipmentId}`
+    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) {
+            typeId = Number((rawType as { id: number }).id)
+        } else if (typeof rawType === 'string') {
+            const match = rawType.match(/\/shipment_types\/(\\d+)$/)
+            typeId = match ? Number(match[1]) : null
+        }
+        if (!typeId) {
+            continue
+        }
+        const desiredQuantity = desiredByTypeId.get(typeId)
+        if (!desiredQuantity) {
+            await deleteShipmentBovine(entry.id)
+            continue
+        }
+        if (entry.nbBovinSend !== desiredQuantity) {
+            await updateShipmentBovine(entry.id, {nbBovinSend: desiredQuantity})
+        }
+        desiredByTypeId.delete(typeId)
+    }
 
+    for (const [typeId, quantity] of desiredByTypeId.entries()) {
+        await createShipmentBovine({
+            shipment: shipmentIri,
+            shipmentType: `/api/shipment_types/${typeId}`,
+            nbBovinSend: quantity
+        })
+    }
+}
 const buildPayload = () => {
-    const normalizedLicensePlate = form.licensePlate.trim()
+    const normalizedLicensePlate = form.licencePlate.trim()
     const normalizedShipmentDate = form.shipmentDate.trim()
     const normalizedCustomerId = form.customerId.trim()
     const normalizedTruckId = form.truckId.trim()
@@ -488,36 +546,29 @@ const buildPayload = () => {
     const addressIri = normalizedAddressId
         ? `/api/addresses/${normalizedAddressId}`
         : null
-    const normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
-    const shipmentTypeIri = normalizedShipmentTypeId
-        ? `/api/shipment_types/${normalizedShipmentTypeId}`
-        : null
-
-    const rawQuantity = Number(shipmentQuantity.value ?? 0)
-    const normalizedQuantity = Number.isFinite(rawQuantity) ? Math.max(0,
-        Math.trunc(rawQuantity)) : 0
 
     return {
-        licensePlate: normalizedLicensePlate,
+        licencePlate: normalizedLicensePlate,
         shipmentDate: normalizedShipmentDate,
         customer: customerIri,
         truck: truckIri,
         carrier: carrierIri,
         driver: driverIri,
         user: userIri,
-        address: addressIri,
-        shipmentType: shipmentTypeIri,
-        nbBovinSend: normalizedQuantity,
+        address: addressIri
     }
 }
 
 const saveDraft = async () => {
     const payload = buildPayload()
     if (!shipmentStore.current) {
-        await shipmentStore.createShipment({
+        const created = await shipmentStore.createShipment({
             currentStep: 0,
             ...payload
         })
+        if (created) {
+            await syncBovinShipments(created.id, [])
+        }
         return
     }
 
@@ -525,6 +576,10 @@ const saveDraft = async () => {
         currentStep: shipmentStore.current.currentStep,
         ...payload
     })
+    await syncBovinShipments(
+        shipmentStore.current.id,
+        shipmentStore.current?.bovinShipments ?? []
+    )
 }
 
 defineExpose({saveDraft})
@@ -538,6 +593,7 @@ const validate = async () => {
         })
         if (created) {
             await shipmentStore.loadShipment(created.id)
+            await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
             await router.push(`/shipment/${created.id}`)
         }
         return
@@ -548,5 +604,6 @@ const validate = async () => {
         ...payload
     })
     await shipmentStore.loadShipment(shipmentStore.current.id)
+    await syncBovinShipments(shipmentStore.current.id, shipmentStore.current?.bovinShipments ?? [])
 }
 </script>

frontend/components/shipment/shipment-loading.vue

@@ -1,26 +0,0 @@
-<template>
-    <div class="flex flex-col items-center gap-[118px]">
-        <h1 class="font-bold text-5xl uppercase text-primary-500">Chargement des bovins</h1>
-        <div
-            class="w-full flex flex-col items-center justify-center">
-            <UiLoadingDots />
-        </div>
-        <UiButton
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
-            @click="goNext"
-        >Peser</UiButton>
-    </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/shipment/shipment-weight.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
+            <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
@@ -11,27 +11,27 @@
             </div>
             <div v-else-if="displayWeight !== null" class="w-full">
                 <div
-                    class="w-full flex flex-col items-center justify-center border border-primary-500 h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
+                    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]">
-        <UiButton
+        <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
-        <UiButton
+        >{{ 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</UiButton>
-        <UiButton
+        >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</UiButton>
+        >Générer le bon</button>
     </div>
 </template>
 
@@ -75,7 +75,7 @@ const printReceipt = async () => {
 
     await saveWeight()
     const shipment = shipmentStore.current
-    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licensePlate ?? 'immat'}.pdf`
+    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.

frontend/components/ui/UiButton.vue

@@ -1,39 +0,0 @@
-<template>
-    <component
-        :is="'button'"
-        :type="type"
-        :disabled="isDisabled"
-        class="inline-flex items-center justify-center rounded-md"
-        :class="[
-            isDisabled ? 'cursor-not-allowed opacity-60' : 'cursor-pointer',
-            buttonClass
-        ]"
-        v-bind="attrs"
-    >
-        <slot v-if="!loading" />
-        <UiLoadingDots v-else />
-    </component>
-</template>
-
-<script setup lang="ts">
-import {computed, useAttrs} from 'vue'
-
-defineOptions({inheritAttrs: false})
-
-const props = withDefaults(
-    defineProps<{
-        type?: 'button' | 'submit' | 'reset'
-        disabled?: boolean
-        loading?: boolean
-        buttonClass?: string
-    }>(),
-    {
-        disabled: false,
-        loading: false,
-        buttonClass: ''
-    }
-)
-
-const attrs = useAttrs()
-const isDisabled = computed(() => props.disabled || props.loading)
-</script>

frontend/components/ui/UiCheckbox.vue

@@ -1,14 +1,14 @@
 <template>
     <div :class="wrapperClass">
         <label
-            class="flex items-center gap-2 cursor-pointer text-primary-700"
+            class="flex items-center gap-2"
             :class="labelClass"
         >
             <input
                 type="checkbox"
                 :checked="checked"
                 :disabled="disabled"
-                :class="['h-4 w-4 cursor-pointer text-primary-500', inputClass]"
+                :class="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 text-primary-700"
+            class="font-bold uppercase text-xl mb-2"
             :class="labelClass"
         >
             {{ label }}
@@ -14,9 +14,9 @@
             :value="modelValue ?? ''"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black justify-self-start text-xl pb-[6px] uppercase bg-transparent appearance-none h-[34px]"
             :class="[
-                isEmpty ? 'text-neutral-400' : 'text-primary-700',
+                isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-pointer',
                 inputClass
             ]"

frontend/components/ui/UiNumberInput.vue

@@ -1,10 +1,9 @@
-// flex row passer en class wraper class flex col ainsi que le wfull 34
 <template>
-    <div :class="['flex', wrapperClass]">
+    <div :class="['flex flex-row items-center gap-2', wrapperClass]">
         <label
             v-if="label"
             :for="id"
-            class="text-xl flex items-center gap-2 text-primary-700"
+            class="text-xl flex items-center"
             :class="labelClass"
         >
             <span
@@ -26,7 +25,7 @@
             :step="step"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black text-xl bg-transparent w-16"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',
@@ -75,41 +74,14 @@ 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 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 numeric = Math.max(0, Number(target.value))
+    emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
 }
 
 const onKeydown = (event: KeyboardEvent) => {

frontend/components/ui/UiRadioGroup.vue

@@ -1,93 +0,0 @@
-<template>
-    <div :class="['flex flex-col', wrapperClass]">
-        <label
-            v-if="label"
-            class="font-bold uppercase text-xl text-primary-700"
-            :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 text-primary-700"
-                :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-primary-700/50 text-primary-700 focus:ring-primary-700"
-                    :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 text-primary-700"
+            class="font-bold uppercase text-xl mb-2"
             :class="labelClass"
         >
             {{ label }}
@@ -13,9 +13,9 @@
             :value="modelValue ?? ''"
             :disabled="disabled || loading"
             v-bind="attrs"
-            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] bg-transparent"
+            class="border-b border-black justify-self-start text-xl pb-[6px] bg-transparent"
             :class="[
-                isEmpty ? 'text-neutral-400' : 'text-primary-700',
+                isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',
                 selectClass
             ]"
@@ -28,7 +28,7 @@
                 v-for="option in options"
                 :key="option.value"
                 :value="option.value"
-                class="text-primary-700"
+                class="text-black"
             >
                 {{ option.label }}
             </option>

frontend/components/ui/UiTextInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl text-primary-500"
+            class="font-bold uppercase text-xl mb-2"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
             :maxlength="maxlength"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl py-[6px] bg-transparent text-primary-500"
+            class="border-b border-black text-xl pb-[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 text-primary-500">{{ label }}</label>
+    <label :for="inputId" class="font-bold uppercase text-xl mb-2">{{ label }}</label>
       <div class="flex items-end gap-8">
           <input
               :id="inputId"
@@ -9,7 +9,7 @@
               type="text"
               :maxlength="maxLength"
               :placeholder="placeholderText"
-              class="border-b border-black flex-1 min-w-0 text-xl text-primary-500 uppercase h-[36px] py-[6px]"
+              class="border-b border-black flex-1 min-w-0 text-xl uppercase h-[30px]"
               @input="handleInput"
           />
           <UiCheckbox

frontend/components/ui/stepper.vue

@@ -4,7 +4,7 @@
             <div
                 v-for="(label, index) in labels"
                 :key="label"
-                class="absolute top-0 whitespace-nowrap text-primary-500"
+                class="absolute top-0 whitespace-nowrap"
                 :class="labelClass(index)"
                 :style="positionStyle(index)"
             >

frontend/composables/useWeighing.ts

@@ -62,7 +62,7 @@ export const useWeighing = ({
             })
         } else {
             await createWeight({
-                reception: `/api/receptions/${reception.value.id}`,
+                reception: `api/receptions/${reception.value.id}`,
                 type: mode,
                 dsd: baseDsd,
                 weight: baseWeight,
@@ -111,7 +111,7 @@ export const useWeighingShipment = ({
 
     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 title = computed(() => (modeShipment === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
     const showLoadingBox = computed(
         () => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
     )
@@ -146,7 +146,7 @@ export const useWeighingShipment = ({
             })
         } else {
             await createWeight({
-                shipment: `/api/shipments/${shipment.value.id}`,
+                shipment: `api/shipments/${shipment.value.id}`,
                 type: modeShipment,
                 dsd: baseDsd,
                 weight: baseWeight,

frontend/constants/steps.ts

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

frontend/layouts/admin.vue

@@ -0,0 +1,106 @@
+<template>
+    <div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
+        <!-- HEADER -->
+        <header class="bg-primary-500 z-50 h-[85px]">
+            <div class="h-full w-full px-6 grid grid-cols-[auto,1fr,auto] items-center gap-8">
+                <NuxtLink to="/" class="grid place-items-center">
+          <span class="grid place-items-center bg-white text-xl font-bold uppercase text-primary-500 p-4">
+            LOGO
+          </span>
+                </NuxtLink>
+
+                <nav class="text-2xl font-bold uppercase text-white"></nav>
+
+                <NuxtLink
+                    to="/"
+                    class="text-xl font-bold uppercase text-white transition hover:opacity-80 justify-self-end"
+                >
+                    Quitter le panel admin
+                </NuxtLink>
+            </div>
+        </header>
+
+        <div class="grid grid-cols-[16rem,1fr] h-[calc(100vh-85px)] min-h-0">
+            <aside class="bg-primary-500 text-white min-h-0 flex flex-col justify-between">
+                <div class="flex flex-col gap-4 p-4 font-bold text-xl">
+                    <!-- Liste des liens à ajouter ci-dessous -->
+                    <NuxtLink
+                        to="/admin/dashboard"
+                        custom v-slot="{ href, navigate, isExactActive }">
+                        <a :href="href"
+                           @click="navigate"
+                           :class="isExactActive ? 'opacity-100' : 'opacity-50'">
+                            Tableau de bord
+                        </a>
+                    </NuxtLink>
+                    <NuxtLink
+                        to="/admin/supplier/supplier-list"
+                        custom v-slot="{ href, navigate }">
+                        <a :href="href"
+                           @click="navigate"
+                           :class="route.path.startsWith('/admin/supplier') ? 'opacity-100' : 'opacity-50'">
+                            Fournisseur
+                        </a>
+                    </NuxtLink>
+                    <NuxtLink
+                        to="/admin/carrier/carrier-list"
+                        custom v-slot="{ href, navigate }">
+                        <a :href="href"
+                           @click="navigate"
+                           :class="route.path.startsWith('/admin/carrier') ? 'opacity-100' : 'opacity-50'">
+                            Transporteur
+                        </a>
+                    </NuxtLink>
+                    <NuxtLink to="/admin/user/list" custom v-slot="{ href, navigate }">
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/user') ? 'opacity-100' : 'opacity-50'"
+                        >
+                            Utilisateurs
+                        </a>
+                    </NuxtLink>
+                    <NuxtLink to="/admin/customer/customer-list">
+                        Client
+                    </NuxtLink>
+                </div>
+
+                <div class="p-4">
+
+                    <button
+                        @click="handleLogout"
+                        class="w-full bg-red-600 hover:bg-red-700 py-2 rounded font-bold"
+                    >
+                        Déconnexion
+                    </button>
+                    <p class="font-bold text-white text-center pt-2">
+                        v{{ version }}
+                    </p>
+                </div>
+            </aside>
+
+            <main class="min-h-0 overflow-auto px-12 py-12 ">
+                <div class="w-full ">
+                    <slot/>
+                </div>
+            </main>
+        </div>
+    </div>
+</template>
+
+
+<script setup lang="ts">
+import {useAuthStore} from '~/stores/auth'
+
+const auth = useAuthStore()
+const {version} = useAppVersion()
+
+const route = useRoute()
+const handleLogout = async () => {
+    try {
+        await auth.logout()
+    } finally {
+        await navigateTo('/login')
+    }
+}
+</script>

frontend/layouts/default.vue

@@ -1,165 +1,54 @@
 <template>
-    <div class="min-h-screen text-neutral-900 flex flex-col">
-        <!-- HEADER -->
-        <header class="w-full bg-primary-500 py-5 px-6">
-            <div class="flex w-full items-center justify-between">
-                <!-- Burger (mobile) -->
+    <div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
+    <header class="w-full border-b border-neutral-200 bg-primary-500">
+            <div class="flex w-full items-center justify-center px-6 py-4">
                 <button
                     type="button"
                     class="inline-flex items-center justify-center text-3xl text-white md:hidden"
                     aria-label="Ouvrir le menu"
                     @click="toggleMenu"
                 >
-          <span aria-hidden="true" class="flex items-center">
-            <Icon name="mdi:menu" size="44"/>
-          </span>
+                    <span aria-hidden="true" class="flex items-center"><Icon name="mdi:menu" size="44"/></span>
                 </button>
-
-                <!-- Logo -->
-                <NuxtLink to="/" class="shrink-0">
-          <span class="flex items-center justify-center bg-white text-xl font-bold uppercase px-6 py-4">
-            LOGO
-          </span>
-                </NuxtLink>
-
-                <!-- NAV centré (desktop) -->
-                <nav
-                    class="hidden md:flex flex-1 items-center justify-center gap-8 text-xl font-bold uppercase text-white"
-                >
-                    <NuxtLink to="/" custom v-slot="{ href, navigate }">
+                <nav class="ml-4 hidden items-center gap-8 text-2xl font-bold uppercase text-white md:flex">
+                    <NuxtLink to="/" custom v-slot="{ href, navigate, isExactActive }">
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="route.path === '/'
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
+                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
                         >
                             Accueil
                         </a>
                     </NuxtLink>
-
                     <NuxtLink
+                        to="/admin/dashboard" custom v-slot="{ href, navigate, isExactActive }"
                         v-if="auth.isAdmin"
-                        to="/admin/supplier/supplier-list"
-                        custom
-                        v-slot="{ href, navigate }"
                     >
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="route.path.startsWith('/admin/supplier')
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
+                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
                         >
-                            Fournisseurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/carrier/carrier-list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/carrier')
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Transporteurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/user/list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/user')
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Utilisateurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/customer/customer-list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/customer')
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Clients
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/bovin/list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/bovin')
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Bovins
+                            Admin
                         </a>
                     </NuxtLink>
                 </nav>
-
-                <!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
+                <NuxtLink to="/" class="flex flex-1 items-center justify-center gap-3">
+                  <span
+                      class="flex items-center justify-center bg-white text-xl font-bold uppercase text-primary-500 p-4"
+                  >
+                    LOGO
+                  </span>
+                </NuxtLink>
                 <div class="w-[44px] md:hidden"></div>
-
-                <!-- User dropdown à droite (desktop) -->
-                <div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white group">
-                    <button
-                        type="button"
-                        class="inline-flex items-center py-2 -my-2 text-xl leading-none transition hover:opacity-80"
-                        aria-haspopup="true"
-                    >
-                        <span class="capitalize font-bold">{{ userDisplayName }}</span>
-                        <span
-                            class="ml-[6px] inline-flex items-center font-bold transition-transform group-hover:rotate-180 group-focus-within:rotate-180">
-                            <Icon name="mdi:chevron-down" size="20"/>
-                        </span>
-                    </button>
-
-                    <div
-                        class="absolute right-0 top-full z-10 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg
-                        opacity-0 invisible pointer-events-none transition
-                        group-hover:opacity-100 group-hover:visible group-hover:pointer-events-auto
-                        group-focus-within:opacity-100 group-focus-within:visible group-focus-within:pointer-events-auto"
-                        role="menu"
-                    >
-                        <button
-                            type="button"
-                            class="w-full px-4 py-2 text-left text-sm font-semibold text-white opacity-85 hover:opacity-100 transition"
-                            @click="handleLogout"
-                        >
-                            Déconnexion
-                        </button>
-                    </div>
-                </div>
+                <button
+                    type="button"
+                    class="ml-auto hidden text-xl font-bold uppercase text-white transition hover:opacity-80 md:inline-flex"
+                    @click="handleLogout"
+                >
+                    Déconnexion
+                </button>
             </div>
-
-            <!-- Overlay (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="opacity-0"
@@ -174,8 +63,6 @@
                     @click="closeMenu"
                 />
             </transition>
-
-            <!-- Drawer (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="-translate-x-full"
@@ -186,7 +73,9 @@
             >
                 <aside
                     v-if="isMenuOpen"
-                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-500 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
+                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-600 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
+                    role="dialog"
+                    aria-modal="true"
                 >
                     <div class="flex items-center justify-between">
                         <span class="text-2xl font-bold uppercase">Menu</span>
@@ -199,30 +88,12 @@
                             <Icon name="mdi:close" size="44"/>
                         </button>
                     </div>
-
                     <nav class="mt-8 flex flex-col gap-6 text-xl font-bold uppercase">
-                        <NuxtLink to="/admin/dashboard" @click="closeMenu">Accueil</NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/supplier/supplier-list" @click="closeMenu">
-                            Fournisseurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/carrier/carrier-list" @click="closeMenu">
-                            Transporteurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/user/list" @click="closeMenu">
-                            Utilisateurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
-                            Clients
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/bovin/list" @click="closeMenu">
-                            Bovins
-                        </NuxtLink>
+                        <NuxtLink to="/" class="opacity-100" @click="closeMenu">Accueil</NuxtLink>
                     </nav>
-
                     <button
-                        v-if="auth.isAuthenticated"
                         type="button"
-                        class="mt-6 text-xl font-bold uppercase"
+                        class="mt-5 text-xl font-bold uppercase"
                         @click="handleLogout"
                     >
                         Déconnexion
@@ -230,10 +101,10 @@
                 </aside>
             </transition>
         </header>
-        <main class="mx-auto w-full max-w-[1280px] mt-16">
+        <main class="mx-auto w-full max-w-[1280px]">
             <slot/>
         </main>
-        <footer class="w-full mt-auto bg-primary-500 px-6 py-3">
+        <footer class="w-full mt-8 bg-primary-500 p-6">
             <p class="font-bold text-white text-right">v{{ version }}</p>
         </footer>
     </div>
@@ -244,11 +115,8 @@ import {useAuthStore} from '~/stores/auth'
 
 const route = useRoute()
 const auth = useAuthStore()
-const {version} = useAppVersion()
-
 const isMenuOpen = ref(false)
-
-const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
+const {version} = useAppVersion()
 
 const closeMenu = () => {
     isMenuOpen.value = false

frontend/pages/admin/bovin/[[id]].vue

@@ -1,104 +0,0 @@
-<template>
-    <form @submit.prevent="validate">
-        <div class="text-primary-500 flex items-center justify-between">
-            <h1 class="text-3xl font-bold uppercase">
-                {{ route.params.id ? 'Modifier bovin' : 'Ajout bovin' }}
-            </h1>
-
-            <UiButton
-                type="submit"
-                :disabled="isLoading || isHydrating"
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
-            >
-                <Icon :name="isEdit ? 'mdi:check' : 'mdi:plus'" size="28" />
-                {{ isEdit ? 'Valider' : 'Ajouter' }}
-            </UiButton>
-        </div>
-
-        <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
-            <UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" />
-            <UiTextInput label="Code bovin" id="code-id" v-model="form.code" />
-        </div>
-    </form>
-</template>
-
-<script setup lang="ts">
-import {createBovin, getBovin, updateBovin} from "~/services/bovine-type";
-import type {BovineTypeData, BovinFormData} from "~/services/dto/bovine-type-data";
-const router = useRouter()
-const route = useRoute()
-const isLoading = ref(false)
-const isHydrating = ref(false)
-
-function 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 idBovin = computed(() => resolveId(route.params.id))
-const isEdit = computed(() => idBovin.value !== null)
-
-const form = reactive<BovinFormData>({
-    label: '',
-    code: ''
-})
-
-
-const hydrateFromBovin = (bovin: BovineTypeData | null) => {
-    if (!bovin) {
-        return
-    }
-    isHydrating.value = true
-    form.label = bovin.label ?? ''
-    form.code = bovin.code ?? ''
-    isHydrating.value = false
-}
-
-watch(
-    () => idBovin.value,
-    async (id) => {
-        if (id === null) {
-            return
-        }
-        isLoading.value = true
-        try {
-            const bovin = await getBovin(id)
-            hydrateFromBovin(bovin)
-        } finally {
-            isLoading.value = false
-        }
-    },
-    {immediate: true}
-)
-async function validate() {
-    if (isLoading.value || isHydrating.value) return
-
-    const normalizedBovinCode = form.code.trim()
-    const normalizedBovinLabel = form.label.trim()
-
-
-    const basePayload = {
-        label: normalizedBovinLabel,
-        code: normalizedBovinCode
-
-    }
-
-    isLoading.value = true
-    try {
-        if (isEdit.value && idBovin.value !== null) {
-            await updateBovin(idBovin.value, basePayload)
-        } else {
-            await createBovin(basePayload)
-        }
-        await navigate()
-    } finally {
-        isLoading.value = false
-    }
-}
-
-async function navigate(){
-    return router.push("/admin/bovin/list")
-}
-</script>

frontend/pages/admin/bovin/list.vue

@@ -1,72 +0,0 @@
-<template>
-    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold text-primary-500 uppercase">Liste des types bovins</h1>
-        <NuxtLink
-            to="/admin/bovin"
-            class="inline-flex items-center justify-center
-                   text-xl text-white uppercase
-                   bg-primary-500 h-[50px] px-8 rounded
-                   hover:opacity-80 gap-2"
-            @click="handleAddClick"
-        >
-            <Icon name="mdi:plus" size="28"  />
-            Ajouter
-        </NuxtLink>
-    </div>
-    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
-        <div class="max-h-96 overflow-y-auto">
-            <div
-                class="sticky
-                       grid grid-cols-2 gap-4
-                       bg-slate-100 px-4 py-3
-                       font-semibold uppercase
-                       tracking-wide"
-            >
-                <div class="col-span-1">Nom</div>
-                <div class="col-span-1">Code</div>
-            </div>
-            <div v-if="bovinList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun type de bovin.
-            </div>
-            <div v-else>
-                <div
-                    v-for="bovin in bovinList"
-                    :key="bovin.id"
-                    class="grid grid-cols-2 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
-                    @click="goToBovin(bovin.id)"
-                >
-                    <div class="col-span-1">{{ bovin.label }}</div>
-                    <div class="col-span-1">{{ bovin.code }}</div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
-        Accès réservé aux administrateurs.
-    </div>
-</template>
-
-<script setup lang="ts">
-import { getBovineTypeList } from "~/services/bovine-type"
-import type { BovineTypeData } from "~/services/dto/bovine-type-data"
-import { useAuthStore } from "~/stores/auth"
-
-const bovinList = ref<BovineTypeData[]>([])
-const router = useRouter()
-const auth = useAuthStore()
-
-const goToBovin = (id: number) => {
-    if (!auth.isAdmin) return
-    router.push(`/admin/bovin/${id}`)
-}
-
-const handleAddClick = (event: Event) => {
-    if (auth.isAdmin) return
-    event.preventDefault()
-}
-
-onMounted(async () => {
-    if (!auth.isAdmin) return
-    bovinList.value = await getBovineTypeList()
-})
-</script>

frontend/pages/admin/carrier/[[id]].vue

@@ -1,21 +1,19 @@
 
 <template>
     <form @submit.prevent="validate">
-    <div class="flex items-center justify-between">
+    <div class="flex items-center justify-between ">
         <h1 class="text-3xl font-bold uppercase">
             {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
         </h1>
 
-        <UiButton
+        <button
             type="submit"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
-        >
-            <Icon name="mdi:check" size="28" />
-            Valider
-        </UiButton>
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+        >Enregistrer
+        </button>
     </div>
 
-    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
+    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
         <UiTextInput
             label = "nom du fournisseur"
             id="carrier-name"
@@ -35,25 +33,21 @@
 <script setup lang="ts">
 import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
 import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
-import {computed} from "vue";
 const router = useRouter()
 const route = useRoute()
-const idCarrier = computed(() => resolveId(route.params.id))
+const idCarrier = Number(route.params.id)
 const isLoading = ref(false)
 const isHydrating = ref(false)
 
-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 form = reactive<CarrierFormData>({
     code:'',
     name:''
 })
 
+definePageMeta({
+    layout: 'admin'
+})
+
 const hydrateFromUser = (carrier: CarrierData | null) => {
     if (!carrier) {
         return
@@ -65,7 +59,7 @@ const hydrateFromUser = (carrier: CarrierData | null) => {
 }
 
 watch(
-    () => idCarrier.value,
+    () => idCarrier,
     async (id) => {
         if (id === null) {
             return
@@ -91,8 +85,8 @@ async function validate() {
 
     }
 
-    if(idCarrier.value){
-        await updateCarrier(idCarrier.value, basePayload)
+    if(idCarrier){
+        await updateCarrier(idCarrier, basePayload)
         navigate()
         return
     }

frontend/pages/admin/carrier/carrier-list.vue

@@ -1,13 +1,11 @@
 <template>
 
     <div class="flex items-center justify-between ">
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
+            <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
             <NuxtLink
                 to="/admin/carrier"
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
-            >
-                <Icon name="mdi:plus" size="28"  />
-                Ajouter
+                class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            >Ajouter
             </NuxtLink>
     </div>
 
@@ -43,6 +41,10 @@ const goToCarrier = (id: number) => {
     router.push(`/admin/carrier/${id}`)
 }
 
+definePageMeta({
+    layout: 'admin'
+})
+
 onMounted(async () => {
     carrierList.value = await getCarrierList(false)
 })

frontend/pages/admin/customer/[[id]].vue

@@ -5,34 +5,31 @@
                 {{ customerId ? "Modifications du client" : "Ajout d'un client" }}
             </h1>
 
-            <UiButton
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            <button
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
-                <Icon :name="customerId ? 'mdi:check' : 'mdi:plus'" size="28" />
-                {{ customerId ? "Valider" : "Ajouter" }}
-            </UiButton>
+                {{ customerId ? "Sauvegarder" : "Ajouter" }}
+            </button>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
-            <UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin"/>
-            <UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin"/>
-            <UiTextInput id="customer-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="customer-label" v-model="form.label" label="Nom du client" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="customer-code" v-model="form.code" label="Code" :disabled="!auth.isAdmin"/>
         </div>
 
         <div class="mx-24 mb-4 py-6 border-t border-black"></div>
         <div class="flex items-center justify-between mb-4">
             <h2 class="text-3xl font-bold uppercase">Adresses client</h2>
-            <UiButton
+            <button
                 type="button"
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="customerId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
-                <Icon name="mdi:plus" size="28" />
                 Ajouter
-            </UiButton>
+            </button>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
@@ -82,6 +79,8 @@ import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
 import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
 import {useAuthStore} from "~/stores/auth"
 
+definePageMeta({layout: "admin"})
+
 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()
@@ -95,9 +94,8 @@ const resolveId = (param: unknown) => {
 const customerId = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
 const form = reactive<CustomerFormData>({
-    name: "",
-    phone: "",
-    email: "",
+    label: "",
+    code: "",
     addresses: [],
 })
 
@@ -124,9 +122,8 @@ const goToEditAddress = (addressId: number | null) => {
 
 const hydrateFromCustomer = (customer: CustomerData | null) => {
     if (!customer) return
-    form.name = customer.name ?? ""
-    form.phone = customer.phone ?? ""
-    form.email = customer.email ?? ""
+    form.label = customer.label ?? ""
+    form.code = customer.code ?? ""
     if (!Array.isArray(customer.addresses) || customer.addresses.length === 0) {
         form.addresses = []
         return
@@ -168,14 +165,12 @@ async function validate() {
     isLoading.value = true
 
     try {
-        const name = form.name.trim()
-        const phone = form.phone?.trim() || null
-        const email = form.email?.trim() || null
+        const label = form.label.trim()
+        const code = form.code.trim()
 
         const customerPayload: CustomerPayload = {
-            name,
-            phone,
-            email,
+            label,
+            code,
         }
         let targetId: number | null = null
 

frontend/pages/admin/customer/address.vue

@@ -8,6 +8,8 @@ import { createAddress, getAddress, updateAddress } from "~/services/address"
 import { getCustomer, updateCustomer } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 
+definePageMeta({ layout: "admin" })
+
 const route = useRoute()
 const router = useRouter()
 const customerId = computed(() => Number(route.query.customerId))

frontend/pages/admin/customer/customer-list.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
+        <h1 class="text-3xl font-bold uppercase">Liste des Clients</h1>
         <NuxtLink
             to="/admin/customer"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
-            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
@@ -15,11 +14,10 @@
     <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
         <div class="max-h-96 overflow-y-auto">
             <div
-                class="sticky top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                class="sticky top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
             >
                 <div>Nom</div>
-                <div>Téléphone</div>
-                <div>Email</div>
+                <div>Code</div>
                 <div>Rue</div>
                 <div>Complément</div>
                 <div>Code Postal</div>
@@ -28,18 +26,17 @@
             </div>
 
             <div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun client.
+                Aucun fournisseur.
             </div>
 
             <div v-for="customer in customerList" :key="customer.id">
                 <div
                     v-if="!customer.addresses || customer.addresses.length === 0"
-                    class="grid grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
+                    class="grid grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
                     @click="goToCustomer(customer.id)"
                 >
-                    <div class="truncate">{{ customer.name || "—" }}</div>
-                    <div class="truncate">{{ customer.phone || "—" }}</div>
-                    <div class="truncate">{{ customer.email || "—" }}</div>
+                    <div class="truncate">{{ customer.label }}</div>
+                    <div class="truncate">{{ customer.code }}</div>
                     <div class="col-span-1">Pas d'adresse</div>
                     <div class="uppercase truncate">{{"—"}}</div>
                     <div class="uppercase truncate">{{"—"}}</div>
@@ -51,15 +48,14 @@
                     <div
                         v-for="(address, idx) in customer.addresses"
                         :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                         :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
                         @click="goToCustomer(customer.id)"
                     >
                         <div class="truncate">
-                            {{ idx === 0 ? (customer.name || "—") : "↳" }}
+                            {{ idx === 0 ? customer.label : "↳" }}
                         </div>
-                        <div class="truncate">{{ idx === 0 ? (customer.phone || "—") : ""  }}</div>
-                        <div class="truncate">{{ idx === 0 ? (customer.email || "—") : ""  }}</div>
+                        <div class="truncate">{{ idx === 0 ? customer.code : ""  }}</div>
                         <div class="truncate">{{ address.street || "—" }}</div>
                         <div class="truncate">{{ address.street2 || "—" }}</div>
                         <div>{{ address.postalCode || "—"  }}</div>
@@ -70,12 +66,11 @@
 
                 <template v-else>
                     <div
-                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                         @click="goToCustomer(customer.id)"
                     >
-                        <div class="truncate">{{ customer.name || "—" }}</div>
-                        <div class="truncate">{{ customer.phone || "—" }}</div>
-                        <div class="truncate">{{ customer.email || "—" }}</div>
+                        <div class="truncate">{{ customer.label }}</div>
+                        <div class="truncate">{{ customer.code }}</div>
                         <div class="col-span-5 text-slate-400">
                             Adresses non chargées
                         </div>
@@ -94,6 +89,8 @@ import { getCustomerList } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 import { useAuthStore } from "~/stores/auth"
 
+definePageMeta({ layout: "admin" })
+
 const customerList = ref<CustomerData[]>([])
 const router = useRouter()
 const auth = useAuthStore()

frontend/pages/admin/dashboard.vue

@@ -0,0 +1,7 @@
+<template>
+</template>
+<script setup lang="ts">
+definePageMeta({
+    layout: 'admin'
+})
+</script>

frontend/pages/admin/supplier/[[id]].vue

@@ -5,14 +5,13 @@
                 {{ supplierId ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
             </h1>
 
-            <UiButton
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            <button
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
-                <Icon :name="supplierId ? 'mdi:check' : 'mdi:plus'" size="28" />
-                {{ supplierId ? "Valider" : "Ajouter" }}
-            </UiButton>
+                {{ supplierId ? "Sauvegarder" : "Ajouter" }}
+            </button>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
@@ -24,15 +23,14 @@
         <div class="mx-24 mb-4 py-6 border-t border-black"></div>
         <div class="flex items-center justify-between mb-4">
             <h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
-            <UiButton
+            <button
                 type="button"
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="supplierId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
-                <Icon name="mdi:plus" size="28" />
                 Ajouter
-            </UiButton>
+            </button>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
@@ -82,6 +80,8 @@ import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
 import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
 import {useAuthStore} from "~/stores/auth"
 
+definePageMeta({layout: "admin"})
+
 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()

frontend/pages/admin/supplier/address.vue

@@ -8,6 +8,8 @@ import {createAddress, getAddress, updateAddress} from "~/services/address";
 import {getSupplier, updateSupplier} from "~/services/supplier";
 import type {SupplierData} from "~/services/dto/supplier-data";
 
+definePageMeta({ layout: "admin" })
+
 const route = useRoute()
 const router = useRouter()
 const supplierId = computed(() => { return Number(route.query.supplierId) })

frontend/pages/admin/supplier/supplier-list.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
+        <h1 class="text-3xl font-bold uppercase">Liste des fournisseurs</h1>
         <NuxtLink
             to="/admin/supplier"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
-            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
@@ -90,6 +89,8 @@ import { getSupplierList } from "~/services/supplier"
 import type { SupplierData } from "~/services/dto/supplier-data"
 import { useAuthStore } from "~/stores/auth"
 
+definePageMeta({ layout: "admin" })
+
 const supplierList = ref<SupplierData[]>([])
 const router = useRouter()
 const auth = useAuthStore()

frontend/pages/admin/user/[[id]].vue

@@ -5,16 +5,15 @@
             <h1 class="text-3xl font-bold uppercase">
                 {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
             </h1>
-            <UiButton
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            <button
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
             >
-                <Icon :name="userId ? 'mdi:check' : 'mdi:plus'" size="28" />
-                {{ userId ? 'Valider' : 'Ajouter' }}
-            </UiButton>
+                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
+            </button>
         </div>
 
-        <div class="grid gap-y-16 gap-x-40 py-12">
+        <div class="grid gap-y-16 gap-x-40 mb-16">
             <UiTextInput
                 id="user-name"
                 v-model="form.username"
@@ -39,6 +38,10 @@
     </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'

frontend/pages/admin/user/list.vue

@@ -1,11 +1,10 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
+        <h1 class="text-3xl font-bold uppercase">Liste des utilisateurs</h1>
         <NuxtLink
-            to="/admin/user"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="router.push('/admin/user/')"
         >
-            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
 
@@ -29,7 +28,7 @@
                     {{ user.username }}
                 </div>
                 <div>
-                    {{ getRoleLabels(user.roles) }}
+                    {{ user.roles?.join(', ') || ' ---' }}
                 </div>
             </div>
         </div>
@@ -38,28 +37,20 @@
 
 
 <script setup lang="ts">
+definePageMeta({
+    layout: 'admin'
+})
+
 import type {UserData} from "~/services/dto/user-data";
-import {getAdminUsers} from "~/services/auth";
-import {ROLE} from "~/utils/constants";
+import {getAdminUsers, getUsers} from "~/services/auth";
 
 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/identification-bovin.vue

@@ -0,0 +1,49 @@
+<template>
+    <div>
+        <div class="flex justify-between">
+            <h1 class="font-bold text-4xl uppercase">Passeport du bovin</h1>
+            <p v-if="bovinData">{{ bovinData.presencePeriod }}</p>
+        </div>
+        <div class="overflow-x-auto mt-12" v-if="bovinData">
+            <table class="w-full border-collapse border border-black text-sm">
+                <tr>
+                    <th
+                        rowspan="2"
+                        class="w-10 border border-black p-0 align-middle"
+                    >
+                        <div class="flex h-full w-full items-center justify-center">
+                          <span class="-rotate-90 whitespace-nowrap font-semibold tracking-widest">
+                            VEAU
+                          </span>
+                        </div>
+                    </th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">N° de travail</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">Sexe</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">Code Race</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">Code pays</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">Type de racial</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">Date de naissance</th>
+                </tr>
+
+                <tr>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.workNumber }}</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.sex }}</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.breedType }}</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">FR {{ bovinData.numeroNational }}</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">???</th>
+                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.birthDate }}</th>
+                </tr>
+            </table>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {getBovinData} from "~/services/identification-bovin";
+
+const bovinData = ref<IdentificationBovinData|null>()
+
+onMounted(async () => {
+    bovinData.value = await getBovinData('7979580026');
+})
+</script>

frontend/pages/index.vue

@@ -1,27 +1,15 @@
 <script setup lang="ts">
 </script>
 <template>
-    <div class="flex flex-wrap justify-center pb-16 gap-12">
+    <div class="flex flex-wrap justify-center mt-8 gap-8 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="/infrastructure/building" iconName="material-symbols:warehouse-outline-rounded" />
-        <card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
-            <template #label>
-                Réceptions<br>EN ATTENTE
-            </template>
-        </card-link>
-        <card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
-            <template #label>
-                EXPÉDITIONS<br>EN ATTENTE
-            </template>
-        </card-link>
-        <card-link label="CASES" link="/infrastructure/case" iconName="material-symbols:bottom-sheets-outline" />
+        <card-link label="PLAN DE SITE" link="/" iconName="mdi:warehouse" />
+        <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="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 link="/" iconName="mdi:cow">
-            <template #label>
-                PASSEPORT<br>DU BOVIN
-            </template>
-        </card-link>
+        <card-link label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />
     </div>
 </template>

frontend/pages/infrastructure/building.vue

@@ -1,242 +0,0 @@
-<template>
-    <div class="min-h-screen">
-        <!-- En-tête de page avec retour et titre -->
-        <div class="flex items-center justify-between mb-8">
-            <div class="flex items-center gap-10">
-                <Icon
-                    @click="router.push('/')"
-                    name="gg:arrow-left-o"
-                    size="44"
-                    class="cursor-pointer text-primary-500"
-                />
-                <h1 class="text-3xl font-bold uppercase text-primary-500">bâtiments</h1>
-            </div>
-        </div>
-
-        <div class="px-[86px] space-y-6">
-            <!-- Liste des bâtiments + rendu du plan de chaque bâtiment -->
-            <div
-                v-for="entry in buildingLayouts"
-                :key="entry.building.id"
-            >
-                <div class="font-semibold tracking-wide text-primary-500">
-                    {{ entry.building.label || `Bâtiment ${entry.building.id}` }}
-                </div>
-
-                <div class="py-4">
-                    <!-- Aucun layout disponible pour ce bâtiment -->
-                    <div v-if="!entry.layout" class="text-sm text-slate-400">
-                        Aucun plan de bâtiment.
-                    </div>
-
-                    <!-- Grille CSS : les cases sont positionnées via spanStyle -->
-                    <div v-else class="overflow-auto">
-                        <div class="grid" :style="entry.gridStyle">
-                            <NuxtLink
-                                v-for="cell in entry.cells"
-                                :key="cell.key"
-                                class="relative text-white flex h-[50px] items-center justify-center border-y-[3px] border-y-black bg-white hover:opacity-85 focus-visible:outline-none"
-                                :class="[cell.sideBorderClass, activeLegendStatutId !== null && cell.caseStatusId !== activeLegendStatutId ? 'opacity-35 hover:opacity-70' : '']"
-                                :style="[cell.spanStyle, cell.sideBorderStyle]"
-                                :to="cell.caseId ? `/infrastructure/case?id=${cell.caseId}` : '/infrastructure/case'"
-                                :title="cell.caseStatusLabel ?? undefined"
-                            >
-                                <!-- Le blanc latéral est géré sur ce bloc interne (conditionnel par voisinage) -->
-                                <div
-                                    class="flex h-full w-full items-center justify-center bg-white"
-                                    :class="cell.contentInsetClass"
-                                    :style="cell.caseStyle"
-                                >
-                                    <!-- Numéro de case -->
-                                    {{ cell.display }}
-                                </div>
-                            </NuxtLink>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Légende : survol d'un statut => atténue les autres cases -->
-            <div class="py-4">
-                <!-- 3 zones fixes pour forcer gauche / centre / droite sur toute la largeur -->
-                <div class="grid w-full grid-cols-3 gap-3">
-                    <div
-                        v-for="(statut, index) in statutLegend"
-                        :key="statut.id"
-                        class="flex min-w-0 cursor-pointer items-center gap-2 py-1"
-                        :class="[
-                            index === 0 ? 'justify-self-start' : '',
-                            index === statutLegend.length - 1 ? 'justify-self-end' : '',
-                            index > 0 && index < statutLegend.length - 1 ? 'justify-self-center' : ''
-                        ]"
-                        @mouseenter="activeLegendStatutId = statut.id"
-                        @mouseleave="activeLegendStatutId = null"
-                    >
-                        <span
-                            class="h-5 w-5 border border-slate-300"
-                            :style="statut.couleur ? { backgroundColor: statut.couleur } : {}"
-                        ></span>
-                        <span class="truncate text-sm uppercase text-slate-700">
-                            {{ statut.label }}
-                        </span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import type {BuildingData} from "~/services/dto/building-data"
-import type {BuildingLayoutData} from "~/services/dto/building-layout-data"
-import type {BuildingCasePositionData} from "~/services/dto/building-case-position-data"
-import type {BuildingCaseStatusData} from "~/services/dto/building-case-status-data"
-import {getBuildingList} from "~/services/building"
-import {getStatutList} from "~/services/statut"
-
-definePageMeta({layout: "default"})
-
-const router = useRouter()
-// Données brutes chargées depuis l'API
-const buildingList = ref<BuildingData[]>([])
-const statutLegend = ref<BuildingCaseStatusData[]>([])
-// Statut actuellement survolé dans la légende (pour filtrage visuel)
-const activeLegendStatutId = ref<number | null>(null)
-// Modèle de vue prêt pour le template (layout + cellules + styles de grille)
-const buildingLayouts = computed(() =>
-    buildingList.value.map((building) => {
-        // On affiche uniquement le premier layout du bâtiment
-        const layout = building.layouts?.[0] ?? null
-        const view = layout ? buildLayoutView(layout) : null
-        return {building, layout, cells: view?.cells ?? [], gridStyle: view?.gridStyle ?? {}}
-    })
-)
-
-type GridCell = {
-    key: string
-    caseId: number | null
-    display: string
-    caseStatusId: number | null
-    caseStatusLabel: string | null
-    // Couleur de fond de la case (dépend du statut)
-    caseStyle?: Record<string, string>
-    // Placement dans la grille CSS (colonne/ligne de départ + span)
-    spanStyle: Record<string, string>
-    // Bordures latérales pointillées si la case touche un gap ou le bord du plan
-    sideBorderClass: string
-    // Couleur des bordures pointillées latérales (reprend la couleur de la cellule)
-    sideBorderStyle?: Record<string, string>
-    // Espace blanc interne uniquement côté(s) adjacent(s) à une autre case
-    contentInsetClass: string
-}
-// Type intermédiaire : garde des infos utiles au calcul des bordures, retirées ensuite
-type GridCellDraft = Omit<GridCell, "sideBorderClass" | "sideBorderStyle" | "contentInsetClass"> & { x: number; columnSpan: number }
-
-// Nettoie la couleur de statut pour éviter les chaînes vides / espaces
-const normalizeCaseStatusColor = (value: string | null | undefined): string | null => {
-    const color = (value ?? "").trim()
-    return color.length > 0 ? color : null
-}
-
-// Styles de base communs à toutes les grilles de bâtiments
-const BASE_GRID_STYLE = {gridAutoRows: "1fr", rowGap: "18px", columnGap: "0px", width: "100%"} as const
-
-// Transforme un layout API en structure de rendu (cellules + style de grille)
-const buildLayoutView = (layout: BuildingLayoutData): {
-    cells: GridCell[];
-    gridStyle: Record<string, string>
-} | null => {
-    const rows = layout.rows ?? 0, cols = layout.columns ?? 0
-    if (rows <= 0 || cols <= 0) return null
-
-    // Liste des positions de cases (filtre de sécurité sur les valeurs nulles)
-    const positions = (layout.casePositions ?? []).filter(Boolean) as BuildingCasePositionData[]
-    // Colonnes occupées par au moins une case (sert à détecter les gaps)
-    const occupiedColumns = new Set<number>()
-    // Sécurité : si deux positions ont le même x/y, on garde la première
-    const seenCoordinates = new Set<string>()
-    const cellDrafts: GridCellDraft[] = []
-
-    // Tri visuel : de haut en bas, puis de gauche à droite
-    const positionsSorted = [...positions].sort(
-        (leftPosition, rightPosition) =>
-            (leftPosition.y ?? 1) - (rightPosition.y ?? 1) || (leftPosition.x ?? 1) - (rightPosition.x ?? 1)
-    )
-    for (const position of positionsSorted) {
-        const x = position.x ?? 1
-        const y = position.y ?? 1
-        const coordinateKey = `${x}-${y}`
-        if (seenCoordinates.has(coordinateKey)) continue
-        seenCoordinates.add(coordinateKey)
-
-        // w/h = nombre de colonnes / lignes occupées par la case dans la grille
-        const columnSpan = position.w ?? 1
-        const rowSpan = position.h ?? 1
-
-        // Une case peut couvrir plusieurs colonnes : on les marque toutes comme occupées
-        for (let column = x; column < x + columnSpan; column++) {
-            if (column <= cols) occupiedColumns.add(column)
-        }
-
-        // Métadonnées utiles au rendu / navigation / légende
-        const caseId = (position.buildingCase?.id ?? null) as number | null
-        const caseNumber = (position.buildingCase?.caseNumber ?? null) as number | null
-        const caseStatusId = position.buildingCase?.statut?.id ?? null
-        const caseStatusLabel = position.buildingCase?.statut?.label ?? null
-        const statusColor = normalizeCaseStatusColor(position.buildingCase?.statut?.couleur)
-
-        cellDrafts.push({
-            key: `case-${layout.id}-${position.id}`,
-            x,
-            columnSpan,
-            caseId,
-            display: caseNumber !== null ? String(caseNumber) : "Case",
-            caseStatusId,
-            caseStatusLabel,
-            caseStyle: statusColor ? {backgroundColor: statusColor} : undefined,
-            // Exemple : "14 / span 1" => commence en colonne 14 et occupe 1 colonne
-            spanStyle: {gridColumn: `${x} / span ${columnSpan}`, gridRow: `${y} / span ${rowSpan}`}
-        })
-    }
-
-    // Colonnes vides = gaps visuels (plus étroites dans la grille)
-    const gapColumns = Array.from({length: cols}, (_, i) => i + 1).filter((x) => !occupiedColumns.has(x))
-    const gapSet = new Set(gapColumns)
-
-    // Ajoute les bordures latérales pointillées pour les cases au contact d'un gap ou d'un bord
-    const cells: GridCell[] = cellDrafts.map(({x, columnSpan, ...cell}) => {
-        const touchesLeftGapOrEdge = x === 1 || gapSet.has(x - 1)
-        const touchesRightGapOrEdge = x + columnSpan - 1 === cols || gapSet.has(x + columnSpan)
-        const sideBorderClass = [
-            touchesLeftGapOrEdge ? "border-l-[3px] [border-left-style:dashed]" : "",
-            touchesRightGapOrEdge ? "border-r-[3px] [border-right-style:dashed]" : ""
-        ].filter(Boolean).join(" ")
-        // Les pointillés latéraux reprennent la couleur de la cellule (si un statut en fournit une)
-        const sideBorderStyle = {
-            ...(cell.caseStyle?.backgroundColor && touchesLeftGapOrEdge ? {borderLeftColor: cell.caseStyle.backgroundColor} : {}),
-            ...(cell.caseStyle?.backgroundColor && touchesRightGapOrEdge ? {borderRightColor: cell.caseStyle.backgroundColor} : {})
-        }
-        // Le "blanc" n'est ajouté qu'entre deux cellules adjacentes (pas sur bord/gap)
-        const contentInsetClass = [
-            !touchesLeftGapOrEdge ? "ml-[4px]" : "",
-            !touchesRightGapOrEdge ? "mr-[4px]" : ""
-        ].filter(Boolean).join(" ")
-        return {...cell, sideBorderClass, sideBorderStyle, contentInsetClass}
-    })
-
-    // Les colonnes de gap sont rendues en 24px, les autres occupent l'espace restant
-    const columnsTemplate = Array.from({length: cols}, (_, i) => (gapSet.has(i + 1) ? "24px" : "minmax(0, 1fr)")).join(" ")
-    return {cells, gridStyle: {gridTemplateColumns: columnsTemplate, ...BASE_GRID_STYLE}}
-}
-
-onMounted(async () => {
-    // Chargement initial des bâtiments et de la légende des statuts
-    const buildings = await getBuildingList()
-    const statuts = await getStatutList()
-    buildingList.value = buildings
-    // Tri alphabétique FR pour une légende stable
-    statutLegend.value = [...statuts].sort((a, b) =>
-        (a.label ?? "").localeCompare(b.label ?? "", "fr", {sensitivity: "base"})
-    )
-})
-</script>

frontend/pages/infrastructure/case.vue

@@ -1,27 +0,0 @@
-<template>
-    <div class="flex justify-center items-center">
-        <UiButton
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            :disabled="!hasCaseId"
-            @click="printCaseReport"
-        >
-            Imprimer
-        </UiButton>
-    </div>
-</template>
-<script setup lang="ts">
-const route = useRoute()
-const { printPdf } = usePdfPrinter()
-
-const caseId = computed(() => Number(route.query.id))
-const hasCaseId = computed(() => Number.isFinite(caseId.value) && caseId.value > 0)
-
-const printCaseReport = async () => {
-    if (!hasCaseId.value) {
-        return
-    }
-
-    const filename = `tableau_poids_case_${caseId.value}.pdf`
-    await printPdf(`/building_cases/${caseId.value}/weights-report`, filename)
-}
-</script>

frontend/pages/login.vue

@@ -39,13 +39,13 @@
         />
       </div>
 
-      <UiButton
+      <button
         type="submit"
         class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
         :disabled="isSubmitting"
       >
         Connexion
-      </UiButton>
+      </button>
           <p class="font-bold">v{{ version }}</p>
       </form>
   </div>

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

@@ -1,28 +1,29 @@
 <template>
-    <div class="flex justify-between h-[52px] mb-[80px]">
-        <div class="flex flex-1 mr-16">
-            <UiStepper
-                :labels="RECEPTION_STEP_LABELS"
-                :current-step="storeReception?.currentStep ?? 0"
-                @select="handleStepSelect"
-            />
+    <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>
-        <UiButton
-            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
-        </UiButton>
-    </div>
-    <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
-    <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
-    <ReceptionProductReceived
-        v-if="storeReception?.currentStep === 2 &&
+        <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 &&
+        <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"/>
+        <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
+    </div>
 </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" size="44" class="cursor-pointer text-primary-500"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
+            <h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
     </div>
 
-    <div class="px-[86px]">
+    <div class="ps-20 " >
         <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) }}</div>
+                <div>{{ formatWeighing(reception, 'gross') }} | {{ formatWeighing(reception, 'tare') }}</div>
             </div>
         </div>
     </div>
@@ -36,20 +36,16 @@
 <script setup lang="ts">
 import type {ReceptionData} from "~/services/dto/reception-data";
 import {getReceptionList} from "~/services/reception";
-import type {ShipmentData} from "~/services/dto/shipment-data";
 
 const receptionList = ref<ReceptionData[]>()
 const router = useRouter()
 
-const formatWeighing = (reception: ReceptionData) => {
-    const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
-    const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
-
-    if (gross == null || tare == null) {
+const formatWeighing = (reception: ReceptionData, type: 'gross' | 'tare') => {
+    const entry = reception.weights?.find((weight) => weight.type === type)
+    if (!entry || entry.weight == null || entry.dsd == null) {
         return '—'
     }
-
-    return `${gross - tare} kg`
+    return `${entry.weight} kg`
 }
 
 const goToReception = (id: number) => {

frontend/pages/reception/waiting-reception.vue

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

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex justify-between h-[52px] mb-[80px]">
+        <div class="flex justify-between h-[52px] mt-6 mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
                     :labels="SHIPMENT_STEP_LABELS"
@@ -9,17 +9,16 @@
 
                 />
             </div>
-            <UiButton
+            <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
-            </UiButton>
+            </button>
         </div>
         <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
         <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>
-        <ShipmentLoading v-if="storeShipment?.currentStep === 2"/>
-        <ShipmentWeight v-if="storeShipment?.currentStep === 3" mode="tare"/>
+        <ShipmentWeight v-if="storeShipment?.currentStep >= 2" 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" size="44" class="cursor-pointer text-primary-500"/>
-        <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
+        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
+        <h1 class="text-3xl font-bold uppercase">listes des expéditions finie</h1>
     </div>
 
-    <div class="px-[86px]">
+    <div class="ps-20 ">
         <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,16 +21,16 @@
                 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="goShipment(shipment.id)"
+                @click="goToshipment(shipment.id)"
             >
                 <div>{{ shipment.identificationNumber }}</div>
                 <div>{{ shipment.shipmentDate }}</div>
-                <div>{{ shipment.customer?.name }}</div>
+                <div>{{ shipment.customer?.label }}</div>
                 <div>{{ shipment.address?.fullAddress }}</div>
                 <div>
-                    <template v-if="formatShipmentLines(shipment).length">
+                    <template v-if="formatBovinShipmentLines(shipment).length">
                         <div
-                            v-for="(line, index) in formatShipmentLines(shipment)"
+                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
                             :key="index"
                             class="leading-5"
                         >
@@ -38,7 +38,7 @@
                         </div>
                     </template>
                 </div>
-                <div>{{ formatWeighing(shipment) }}</div>
+                <div>{{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }}</div>
             </div>
         </div>
     </div>
@@ -51,32 +51,28 @@ import {getShipmentList} from "~/services/shipment";
 const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()
 
-const formatWeighing = (shipment: ShipmentData) => {
-    const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
-    const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
-
-    if (gross == null || tare == null) {
+const formatWeighing = (shipment: ShipmentData, type: 'gross' | 'tare') => {
+    const entry = shipment.weights?.find((weight) => weight.type === type)
+    if (!entry || entry.weight == null || entry.dsd == null) {
         return '—'
     }
-
-    return `${gross - tare} kg`
+    return `${entry.weight} kg`
 }
 
-
-const formatShipmentLines = (shipment: ShipmentData) => {
-    if (!shipment.shipmentType && shipment.nbBovinSend == null) {
+const formatBovinShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.bovinShipments?.length) {
         return []
     }
-
-    const label = typeof shipment.shipmentType === 'string'
-        ? shipment.shipmentType
-        : shipment.shipmentType?.label
-
-    return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
+    return shipment.bovinShipments.map((entry) => {
+        const label = typeof entry.shipmentType === 'string'
+            ? entry.shipmentType
+            : entry.shipmentType?.label
+        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
+    })
 }
 
-const goShipment = (id: number) => {
-    router.push(`/shipment/update/${id}`)
+const goToshipment = (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 ">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
+            <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
         </div>
     </div>
 
-    <div class="px-[86px]">
+    <div class="ps-20 ">
         <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>
@@ -24,12 +24,12 @@
                 @click="goToShipment(shipment.id)"
                 @keydown.enter="goToShipment(shipment.id)"
             >
-                <div>{{ shipment.customer?.name }}</div>
+                <div>{{ shipment.customer?.label }}</div>
                 <div>{{ shipment.address?.fullAddress }}</div>
                 <div>
-                    <template v-if="formatShipmentLines(shipment).length">
+                    <template v-if="formatBovinShipmentLines(shipment).length">
                         <div
-                            v-for="(line, index) in formatShipmentLines(shipment)"
+                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
                             :key="index"
                             class="leading-5"
                         >
@@ -38,7 +38,7 @@
                     </template>
                 </div>
                 <div>{{ shipment.carrier?.name }}</div>
-                <div>{{ shipment.licensePlate }}</div>
+                <div>{{ shipment.licencePlate }}</div>
             </div>
         </div>
     </div>
@@ -55,17 +55,16 @@ const router = useRouter()
 const goToShipment = (id: number) => {
     router.push(`/shipment/${id}`)
 }
-
-const formatShipmentLines = (shipment: ShipmentData) => {
-    if (!shipment.shipmentType && shipment.nbBovinSend == null) {
+const formatBovinShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.bovinShipments?.length) {
         return []
     }
-
-    const label = typeof shipment.shipmentType === 'string'
-        ? shipment.shipmentType
-        : shipment.shipmentType?.label
-
-    return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
+    return shipment.bovinShipments.map((entry) => {
+        const label = typeof entry.shipmentType === 'string'
+            ? entry.shipmentType
+            : entry.shipmentType?.label
+        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
+    })
 }
 
 onMounted(async () => {

frontend/services/bovin-shipment.ts

@@ -0,0 +1,50 @@
+import { useApi } from '~/composables/useApi'
+import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
+import type { ShipmentBovinePayload, BovinShipmentListResponse } from '~/services/dto/bovin-shipment-data'
+
+export async function getBovinShipmentList(
+    shipmentIri: string
+): Promise<BovinShipmentData[]> {
+    const api = useApi()
+    const response = await api.get<BovinShipmentListResponse>(
+        'bovin_shipments',
+        { shipment: shipmentIri },
+        {
+            toastErrorKey: 'errors.shipmentBovine.list'
+        }
+    )
+
+    if (Array.isArray(response)) {
+        return response
+    }
+    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
+        return response['hydra:member']
+    }
+    return []
+}
+
+export async function createShipmentBovine(
+    payload: ShipmentBovinePayload
+): Promise<BovinShipmentData> {
+    const api = useApi()
+    return api.post<BovinShipmentData>('bovin_shipments', payload, {
+        toastErrorKey: 'errors.shipmentBovine.create'
+    })
+}
+
+export async function deleteShipmentBovine(id: number): Promise<void> {
+    const api = useApi()
+    await api.delete<void>(`bovin_shipments/${id}`, {}, {
+        toastErrorKey: 'errors.shipmentBovine.delete'
+    })
+}
+
+export async function updateShipmentBovine(
+    id: number,
+    payload: Partial<ShipmentBovinePayload>
+): Promise<BovinShipmentData> {
+    const api = useApi()
+    return api.patch<BovinShipmentData>(`bovin_shipments/${id}`, payload, {
+        toastErrorKey: 'errors.shipmentBovine.update'
+    })
+}

frontend/services/bovine-type.ts

@@ -1,5 +1,5 @@
 import { useApi } from '~/composables/useApi'
-import type { BovineTypeData, BovinPayload } from "~/services/dto/bovine-type-data";
+import type {BovineTypeData} from "~/services/dto/bovine-type-data";
 
 export type BovineTypeListResponse =
     | BovineTypeData[]
@@ -12,41 +12,12 @@ export async function getBovineTypeList(): Promise<BovineTypeData[]> {
     })
 
     if (Array.isArray(response)) {
-        return response.map(mapToBovineTypeData)
+        return response
     }
 
     if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
-        return response['hydra:member'].map(mapToBovineTypeData)
+        return response['hydra:member']
     }
 
     return []
 }
-
-export async function getBovin(id: number): Promise<BovineTypeData> {
-    const api = useApi()
-    const response = await api.get<BovineTypeData>(`bovine_types/${id}`)
-    return mapToBovineTypeData(response)
-}
-
-export async function createBovin(payload: BovinPayload = {}): Promise<BovineTypeData> {
-    const api = useApi()
-    const response = await api.post<BovineTypeData>('bovine_types', toBovineTypePayload(payload))
-    return mapToBovineTypeData(response)
-}
-
-export async function updateBovin(id: number, payload: BovinPayload = {}): Promise<BovineTypeData> {
-    const api = useApi()
-    const response = await api.patch<BovineTypeData>(`bovine_types/${id}`, toBovineTypePayload(payload))
-    return mapToBovineTypeData(response)
-}
-
-const mapToBovineTypeData = (item: BovineTypeData): BovineTypeData => ({
-    id: item.id,
-    label: item.label,
-    code: item.code
-})
-
-const toBovineTypePayload = (payload: BovinPayload): Partial<BovineTypeData> => ({
-    label: payload.label ?? undefined,
-    code: payload.code ?? undefined
-})

frontend/services/dto/address-data.ts

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

frontend/services/dto/bovin-shipment-data.ts

@@ -0,0 +1,18 @@
+import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
+
+export interface BovinShipmentData {
+    id: number
+    nbBovinSend: number | null
+    shipment?: string | null
+    shipmentType?: ShipmentTypeData | null
+}
+
+export type ShipmentBovinePayload = {
+    nbBovinSend: number
+    shipment: string
+    shipmentType: string
+}
+
+export type BovinShipmentListResponse =
+    | BovinShipmentData[]
+    | { 'hydra:member'?: BovinShipmentData[] }

frontend/services/dto/bovine-type-data.ts

@@ -3,13 +3,3 @@ export interface BovineTypeData{
     label: string
     code: string
 }
-
-export interface BovinFormData {
-    label: string
-    code: string
-}
-
-export type BovinPayload = {
-    label?: string | null
-    code?: string | null
-}

frontend/services/dto/building-case-data.ts

@@ -1,9 +0,0 @@
-import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
-
-export interface BuildingCaseData {
-    id: number
-    caseNumber: number | null
-    code: string | null
-    capacity: number | null
-    statut?: BuildingCaseStatusData | null
-}

frontend/services/dto/building-case-position-data.ts

@@ -1,11 +0,0 @@
-import type { BuildingCaseData } from '~/services/dto/building-case-data'
-
-export interface BuildingCasePositionData {
-    id: number
-    x: number | null
-    y: number | null
-    w: number | null
-    h: number | null
-    renderOrder: string | null
-    buildingCase: BuildingCaseData | null
-}

frontend/services/dto/building-case-status-data.ts

@@ -1,6 +0,0 @@
-export interface BuildingCaseStatusData {
-    id: number
-    label: string | null
-    code: string | null
-    couleur: string | null
-}

frontend/services/dto/building-data.ts

@@ -1,8 +1,5 @@
-import type { BuildingLayoutData } from '~/services/dto/building-layout-data'
-
 export interface BuildingData {
     id: number
     label: string
     code: string
-    layouts?: BuildingLayoutData[] | null
 }

frontend/services/dto/building-layout-data.ts

@@ -1,9 +0,0 @@
-import type { BuildingCasePositionData } from '~/services/dto/building-case-position-data'
-
-export interface BuildingLayoutData {
-    id: number
-    name: string | null
-    columns: number | null
-    rows: number | null
-    casePositions?: BuildingCasePositionData[] | null
-}

frontend/services/dto/customer-data.ts

@@ -4,22 +4,19 @@ export type CustomerAddresses = AddressFormData[] | string[]
 
 export interface CustomerData {
     id: number
-    name: string
-    phone?: string | null
-    email?: string | null
+    label: string
+    code?: string | null
     addresses: CustomerAddresses
 }
 
 export interface CustomerFormData {
-    name: string
-    phone?: string
-    email?: string
+    label: string
+    code?: string
     addresses: AddressFormData[]
 }
 
 export type CustomerPayload = {
-    name: string
-    phone?: string | null
-    email?: string | null
+    label: string
+    code?: string | null
     addresses?: string[]
 }

frontend/services/dto/identification-bovin-data.ts

@@ -0,0 +1,22 @@
+interface IdentificationBovinData {
+    numeroNational: string,
+    sex: string | null,
+    breedType: string | null,
+    workNumber: string | null,
+    birthDate: string | null,
+    birthDateCompletenessFlag: string | null,
+    isFilie: boolean | null,
+    motherNationalNumber: string | null,
+    motherBreedType: string | null,
+    fatherNationalNumber: string | null,
+    fatherBreedType: string | null,
+    birthExploitationNumber: string | null,
+    presencePeriod: PresencePeriod[]
+}
+
+interface PresencePeriod {
+    entryDate: string | null,
+    entryCause: string | null,
+    exitDate: string | null,
+    exitCause: string | null
+}

frontend/services/dto/reception-data.ts

@@ -41,18 +41,9 @@ export interface WeightEntryData {
     weighedAt: string | null
 }
 
-export interface MerchandiseEntryData {
-    merchandiseTypeId: string
-    merchandiseDetail: string
-    selectedBuildingIds: string[]
-    selectedPelletBuildingIds: Record<string, string[]>
-}
-
 export interface WeightFormData {
     id: number
     weight: number
-    weighedAt : string
-    dsd: number
     type: 'gross' | 'tare'
 }
 
@@ -78,7 +69,6 @@ export type ReceptionPayload = {
 }
 
 export type ReceptionFormData = {
-    identificationNumber?: null|string,
     licensePlate: string
     receptionDate: string
     receptionTypeId: string
@@ -89,7 +79,6 @@ export type ReceptionFormData = {
     carrierId: string
     driverId: string
     vehicleId: string
-    weight?: ReceptionFormWeight | null
 }
 
 export type ReceptionFormWeight = {

frontend/services/dto/shipment-data.ts

@@ -9,10 +9,16 @@ export interface ShipmentTypeData {
     code: string
 }
 
+export interface BovinShipmentData {
+    id?: number
+    shipmentType?: ShipmentTypeData | string | null
+    nbBovinSend: number | null
+}
+
 export type ShipmentData = {
     id: number
     identificationNumber?: string | null
-    licensePlate: string | null
+    licencePlate: string | null
     shipmentDate: string
     currentStep: number
     isValid: boolean
@@ -20,8 +26,7 @@ export type ShipmentData = {
     carrier?: CarrierData | null
     truck?: TruckData | null
     customer?: CustomerData | null
-    shipmentType?: ShipmentTypeData | null
-    nbBovinSend?: number | null
+    bovinShipments?: BovinShipmentData[] | null
     weights?: WeightShipmentEntryData[] | null
 
 }
@@ -43,20 +48,20 @@ export type ShipmentFormData = {
     carrierId: string,
     driverId: string,
     vehicleId: string,
-    licensePlate: string,
+    licencePlate: string,
 }
 
 export type ShipmentPayload = {
-    licensePlate?: string | null
+    licencePlate?: string | null
     shipmentDate?: string
     currentStep?: number
     isValid?: boolean
     carrier?: string | null
     truck?: string | null
     customer?: string | null
+    bovinShipments?: string[] | null
     address?: string | null
     user?: string | null
     driver?: string | null
-    shipmentType?: string | null
-    nbBovinSend?: number | null
+
 }

frontend/services/identification-bovin.ts

@@ -0,0 +1,25 @@
+import { useApi } from '~/composables/useApi'
+
+export type BovinDataResponse =
+    | IdentificationBovinData
+    | { 'hydra:member'?: IdentificationBovinData }
+
+export async function getBovinData(
+    nationalNumber: string
+): Promise<IdentificationBovinData | null> {
+    const api = useApi()
+    const response = await api.get<BovinDataResponse>(
+        `bovins/${nationalNumber}/identification`,
+        {},
+        { toastErrorKey: 'errors.building.list' }
+    )
+
+    if (response && typeof response === 'object') {
+        // direct item
+        if (!('hydra:member' in response)) return response as IdentificationBovinData
+        // hydra format
+        if (response['hydra:member']) return response['hydra:member']
+    }
+
+    return null
+}

frontend/services/statut.ts

@@ -1,23 +0,0 @@
-import { useApi } from '~/composables/useApi'
-import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
-
-export type StatutListResponse =
-    | BuildingCaseStatusData[]
-    | { 'hydra:member'?: BuildingCaseStatusData[] }
-
-export async function getStatutList(): Promise<BuildingCaseStatusData[]> {
-    const api = useApi()
-    const response = await api.get<StatutListResponse>('statuts', {}, {
-        toastErrorKey: 'errors.http.get'
-    })
-
-    if (Array.isArray(response)) {
-        return response
-    }
-
-    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
-        return response['hydra:member']
-    }
-
-    return []
-}

frontend/tailwind.config.ts

@@ -8,11 +8,17 @@ export default <Partial<Config>>{
       },
       colors: {
         primary: {
-          700: '#35453C',
-          500: '#456452',
-
+          50: '#f6f9ea',
+          100: '#eaf2cf',
+          200: '#d6e3a4',
+          300: '#c1d47a',
+          400: '#afc85a',
+          500: '#9ebb43',
+          600: '#7e9735',
+          700: '#607228',
+          800: '#414d1a',
+          900: '#24290d'
         }
-
       }
     }
   }

migrations/Version20260213093000.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260213093000 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add name, phone and email fields to customer.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer ADD name VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE customer ADD phone VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE customer ADD email VARCHAR(255) DEFAULT NULL');
-        $this->addSql('UPDATE customer SET name = label WHERE name IS NULL');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN name SET NOT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer DROP name');
-        $this->addSql('ALTER TABLE customer DROP phone');
-        $this->addSql('ALTER TABLE customer DROP email');
-    }
-}

migrations/Version20260213101500.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260213101500 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Align customer with supplier: keep name/email/phone and drop label/code.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer ALTER COLUMN name TYPE VARCHAR(180)');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN email TYPE VARCHAR(180)');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN phone TYPE VARCHAR(40)');
-        $this->addSql('ALTER TABLE customer DROP COLUMN label');
-        $this->addSql('ALTER TABLE customer DROP COLUMN code');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer ADD label VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE customer ADD code VARCHAR(255) DEFAULT NULL');
-        $this->addSql('UPDATE customer SET label = name WHERE label IS NULL');
-        $this->addSql("UPDATE customer SET code = regexp_replace(upper(name), '[^A-Z0-9]+', '_', 'g') WHERE code IS NULL");
-        $this->addSql('ALTER TABLE customer ALTER COLUMN label SET NOT NULL');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN code SET NOT NULL');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN email TYPE VARCHAR(255)');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN phone TYPE VARCHAR(255)');
-    }
-}

migrations/Version20260213114000.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260213114000 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Allow only one bovin_shipment row per shipment.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // Keep one row per shipment (latest id), required before adding unique index.
-        $this->addSql(<<<'SQL'
-            DELETE FROM bovin_shipment bs
-            USING (
-                SELECT id, ROW_NUMBER() OVER (PARTITION BY shipment_id ORDER BY id DESC) AS rn
-                FROM bovin_shipment
-                WHERE shipment_id IS NOT NULL
-            ) d
-            WHERE bs.id = d.id
-              AND d.rn > 1
-            SQL);
-
-        $this->addSql('DROP INDEX IF EXISTS uniq_bovin_shipment');
-        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP INDEX IF EXISTS uniq_bovin_shipment_one_type');
-        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment ON bovin_shipment (shipment_id, shipment_type_id)');
-    }
-}

migrations/Version20260218144828.php

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260218144828 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4502ee48a36');
-        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4507be036fc');
-        $this->addSql('DROP TABLE bovin_shipment');
-        $this->addSql('ALTER TABLE shipment ADD nb_bovin_send INT NOT NULL');
-        $this->addSql('ALTER TABLE shipment ADD shipment_type_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC2EE48A36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE');
-        $this->addSql('CREATE INDEX IDX_2CB20DC2EE48A36 ON shipment (shipment_type_id)');
-        $this->addSql('DROP INDEX uniq_weight_shipment_type');
-        $this->addSql('DROP INDEX uniq_weight_reception_type');
-        $this->addSql('ALTER INDEX idx_weight_shipment RENAME TO IDX_7CD55417BE036FC');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, shipment_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX idx_7049f4507be036fc ON bovin_shipment (shipment_id)');
-        $this->addSql('CREATE INDEX idx_7049f4502ee48a36 ON bovin_shipment (shipment_type_id)');
-        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
-        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4502ee48a36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4507be036fc FOREIGN KEY (shipment_id) REFERENCES shipment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC2EE48A36');
-        $this->addSql('DROP INDEX IDX_2CB20DC2EE48A36');
-        $this->addSql('ALTER TABLE shipment DROP nb_bovin_send');
-        $this->addSql('ALTER TABLE shipment DROP shipment_type_id');
-        $this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
-        $this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
-        $this->addSql('ALTER INDEX idx_7cd55417be036fc RENAME TO idx_weight_shipment');
-    }
-}

migrations/Version20260219100826.php

@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260219100826 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE building_case (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, case_number INT NOT NULL, code VARCHAR(255) NOT NULL, capacity INT NOT NULL, id_building_id INT DEFAULT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX IDX_DE2CEE505538B3E5 ON building_case (id_building_id)');
-        $this->addSql('CREATE TABLE building_case_position (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, x INT NOT NULL, y INT NOT NULL, w INT NOT NULL, h INT NOT NULL, render_order VARCHAR(255) NOT NULL, building_layout_id INT NOT NULL, building_case_id INT NOT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX IDX_ACCDF9077040AE67 ON building_case_position (building_layout_id)');
-        $this->addSql('CREATE INDEX IDX_ACCDF907F8D859DF ON building_case_position (building_case_id)');
-        $this->addSql('CREATE TABLE building_layout (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(255) NOT NULL, columns INT NOT NULL, rows INT NOT NULL, id_building_id INT NOT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX IDX_2A8CB1095538B3E5 ON building_layout (id_building_id)');
-        $this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE505538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (id)');
-        $this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF9077040AE67 FOREIGN KEY (building_layout_id) REFERENCES building_layout (id) NOT DEFERRABLE');
-        $this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF907F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
-        $this->addSql('ALTER TABLE building_layout ADD CONSTRAINT FK_2A8CB1095538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (id) NOT DEFERRABLE');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE building_case DROP CONSTRAINT FK_DE2CEE505538B3E5');
-        $this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF9077040AE67');
-        $this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF907F8D859DF');
-        $this->addSql('ALTER TABLE building_layout DROP CONSTRAINT FK_2A8CB1095538B3E5');
-        $this->addSql('DROP TABLE building_case');
-        $this->addSql('DROP TABLE building_case_position');
-        $this->addSql('DROP TABLE building_layout');
-    }
-}

migrations/Version20260220101607.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260220101607 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE statut (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, color VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
-        $this->addSql('ALTER TABLE building_case ADD statut_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE50F6203804 FOREIGN KEY (statut_id) REFERENCES statut (id)');
-        $this->addSql('CREATE INDEX IDX_DE2CEE50F6203804 ON building_case (statut_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE statut');
-        $this->addSql('ALTER TABLE building_case DROP CONSTRAINT FK_DE2CEE50F6203804');
-        $this->addSql('DROP INDEX IDX_DE2CEE50F6203804');
-        $this->addSql('ALTER TABLE building_case DROP statut_id');
-    }
-}

migrations/Version20260225110000.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260225110000 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Rename shipment.licence_plate to license_plate';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE shipment RENAME COLUMN licence_plate TO license_plate');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE shipment RENAME COLUMN license_plate TO licence_plate');
-    }
-}

migrations/Version20260225123000.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260225123000 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Create bovine table and relation to building_case.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('CREATE TABLE bovine (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, building_case_id INT DEFAULT NULL, national_number VARCHAR(50) NOT NULL, received_weight INT DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE INDEX IDX_EA9E2A42F8D859DF ON bovine (building_case_id)');
-        $this->addSql('CREATE UNIQUE INDEX uniq_bovine_national_number ON bovine (national_number)');
-        $this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_EA9E2A42F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_EA9E2A42F8D859DF');
-        $this->addSql('DROP TABLE bovine');
-    }
-}

migrations/Version20260225131500.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260225131500 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add arrival_date column to bovine table.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE bovine ADD arrival_date DATE DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE bovine DROP arrival_date');
-    }
-}

src/ApiResource/BovinIdentification.php

@@ -15,7 +15,8 @@ use App\State\BovinIdentificationProvider;
             uriTemplate: '/bovins/{numeroNational}/identification',
             provider: BovinIdentificationProvider::class
         ),
-    ]
+    ],
+    security: "is_granted('ROLE_USER')",
 )]
 final class BovinIdentification
 {

src/Command/SeedCommand.php

@@ -5,24 +5,15 @@ declare(strict_types=1);
 namespace App\Command;
 
 use App\Entity\Address;
-use App\Entity\Bovine;
-use App\Entity\BovineType;
 use App\Entity\Building;
-use App\Entity\BuildingCase;
-use App\Entity\BuildingCasePosition;
-use App\Entity\BuildingLayout;
 use App\Entity\Carrier;
-use App\Entity\Customer;
 use App\Entity\Driver;
 use App\Entity\MerchandiseType;
 use App\Entity\PelletType;
 use App\Entity\ReceptionType;
-use App\Entity\ShipmentType;
-use App\Entity\Statut;
 use App\Entity\Supplier;
 use App\Entity\Truck;
 use App\Entity\Vehicle;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -58,18 +49,8 @@ class SeedCommand extends Command
         $this->seedMerchandiseTypes();
         $this->seedPelletTypes();
         $this->seedBuildings();
-        $this->entityManager->flush();
-
-        $this->seedBuildingInfrastructure();
-        $this->entityManager->flush();
-
-        $this->seedBovines($io);
         $this->seedReceptionTypes();
-        $this->seedBovineTypes();
-        $this->seedShipmentTypes();
         $this->seedSuppliers();
-        $this->entityManager->flush();
-        $this->seedCustomers($io);
 
         $this->entityManager->flush();
 
@@ -80,7 +61,7 @@ class SeedCommand extends Command
 
     private function seedTrucks(): array
     {
-        $trucks  = ['Citerne', 'Porteur', 'Plateau', 'Remorque', 'Benne'];
+        $trucks  = ['Citerne', 'Porteur'];
         $citerne = null;
         $porteur = null;
         foreach ($trucks as $name) {
@@ -180,7 +161,6 @@ class SeedCommand extends Command
             ['label' => 'Foin', 'code' => 'FOIN'],
             ['label' => 'Paille', 'code' => 'PAILLE'],
             ['label' => 'Granule', 'code' => 'GRANULE'],
-            ['label' => 'Autres', 'code' => 'AUTRES'],
         ];
         foreach ($merchandiseTypes as $type) {
             $this->upsertByCode(MerchandiseType::class, $type['code'], static function (MerchandiseType $entity) use ($type) {
@@ -227,137 +207,6 @@ class SeedCommand extends Command
         }
     }
 
-    private function seedBuildingInfrastructure(): void
-    {
-        $statusByCode = [];
-        $statusRows   = [
-            ['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
-            ['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
-            ['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
-        ];
-        foreach ($statusRows as $statusRow) {
-            /** @var Statut $status */
-            $status = $this->upsertByCode(Statut::class, $statusRow['code'], static function (Statut $entity) use ($statusRow) {
-                $entity
-                    ->setLabel($statusRow['label'])
-                    ->setCode($statusRow['code'])
-                    ->setColor($statusRow['color'])
-                ;
-            });
-            $statusByCode[$statusRow['code']] = $status;
-        }
-
-        $buildingRepo         = $this->entityManager->getRepository(Building::class);
-        $layoutByBuildingCode = [];
-        $layoutRows           = [
-            ['buildingCode' => 'B1', 'name' => 'plan1', 'columns' => 23, 'rows' => 2],
-            ['buildingCode' => 'B2', 'name' => 'plan2', 'columns' => 23, 'rows' => 2],
-            ['buildingCode' => 'B3', 'name' => 'plan3', 'columns' => 23, 'rows' => 2],
-        ];
-        foreach ($layoutRows as $layoutRow) {
-            $building = $buildingRepo->findOneBy(['code' => $layoutRow['buildingCode']]);
-            if (!$building instanceof Building) {
-                continue;
-            }
-
-            /** @var BuildingLayout $layout */
-            $layout = $this->upsertByName(BuildingLayout::class, $layoutRow['name'], static function (BuildingLayout $entity) use ($layoutRow, $building) {
-                $entity
-                    ->setName($layoutRow['name'])
-                    ->setColumns($layoutRow['columns'])
-                    ->setRows($layoutRow['rows'])
-                    ->setIdBuilding($building)
-                ;
-            });
-            $layoutByBuildingCode[$layoutRow['buildingCode']] = $layout;
-        }
-
-        $caseRows = [
-            ['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'status' => 'LB'],
-            ['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'status' => 'OC'],
-            ['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'status' => 'ML'],
-            ['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'status' => 'LB'],
-            ['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'status' => 'OC'],
-            ['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'status' => 'LB'],
-            ['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'status' => 'ML'],
-            ['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'status' => 'OC'],
-            ['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'status' => 'ML'],
-            ['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'status' => 'LB'],
-            ['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'status' => 'OC'],
-            ['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'status' => 'ML'],
-        ];
-
-        $caseByCode = [];
-        foreach ($caseRows as $caseRow) {
-            $building = $buildingRepo->findOneBy(['code' => $caseRow['buildingCode']]);
-            $status   = $statusByCode[$caseRow['status']] ?? null;
-            if (!$building instanceof Building || !$status instanceof Statut) {
-                continue;
-            }
-
-            for ($caseNumber = $caseRow['from']; $caseNumber <= $caseRow['to']; ++$caseNumber) {
-                $code = sprintf('%s-C%d', $caseRow['buildingCode'], $caseNumber);
-
-                /** @var BuildingCase $buildingCase */
-                $buildingCase = $this->upsertByCode(BuildingCase::class, $code, static function (BuildingCase $entity) use ($code, $caseNumber, $building, $status) {
-                    $entity
-                        ->setCode($code)
-                        ->setCaseNumber($caseNumber)
-                        ->setCapacity(15)
-                        ->setIdBuilding($building)
-                        ->setStatut($status)
-                    ;
-                });
-                $caseByCode[$code] = $buildingCase;
-            }
-        }
-
-        $slots        = $this->buildSlotMap();
-        $positionRepo = $this->entityManager->getRepository(BuildingCasePosition::class);
-
-        foreach (['B1' => 'plan1', 'B2' => 'plan2', 'B3' => 'plan3'] as $buildingCode => $layoutName) {
-            $layout = $layoutByBuildingCode[$buildingCode] ?? null;
-            if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
-                continue;
-            }
-
-            foreach ($slots as $slot) {
-                $caseCode     = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
-                $buildingCase = $caseByCode[$caseCode] ?? null;
-                if (!$buildingCase instanceof BuildingCase) {
-                    continue;
-                }
-
-                $position = $positionRepo->findOneBy([
-                    'buildingLayout' => $layout,
-                    'buildingCase'   => $buildingCase,
-                    'x'              => $slot['x'],
-                    'y'              => $slot['y'],
-                ]);
-
-                if ($position instanceof BuildingCasePosition) {
-                    ++$this->updated;
-
-                    continue;
-                }
-
-                $position = new BuildingCasePosition();
-                $position
-                    ->setX($slot['x'])
-                    ->setY($slot['y'])
-                    ->setW($slot['w'])
-                    ->setH($slot['h'])
-                    ->setRenderOrder((string) $slot['renderOrder'])
-                    ->setBuildingLayout($layout)
-                    ->setBuildingCase($buildingCase)
-                ;
-
-                ++$this->created;
-                $this->entityManager->persist($position);
-            }
-        }
-    }
-
     private function seedReceptionTypes(): void
     {
         $receptionTypes = [
@@ -374,167 +223,6 @@ class SeedCommand extends Command
         }
     }
 
-    private function seedBovines(SymfonyStyle $io): void
-    {
-        $rows = [
-            [1, 15, '7979580026', 390, '2026-02-25'],
-            [5, 113, '4405604924', 397, '2025-05-22'],
-            [4, 113, '4405604944', 375, '2025-05-22'],
-            [2, 113, '4963291114', 319, '2025-05-22'],
-            [3, 113, '4405604922', 386, '2025-05-22'],
-            [6, 126, '4415811026', 367, '2025-07-02'],
-            [7, 126, '4950971149', 398, '2025-07-02'],
-            [8, 126, '4950971170', 386, '2025-07-02'],
-            [9, 126, '4489751630', 408, '2025-07-02'],
-            [10, 126, '8551323003', 478, '2025-07-02'],
-            [11, 126, '8503833703', 378, '2025-07-02'],
-            [12, 126, '4402104572', 379, '2025-07-02'],
-            [13, 126, '4402104580', 465, '2025-07-02'],
-            [14, 126, '4402104607', 381, '2025-07-02'],
-            [15, 126, '8504059581', 446, '2025-07-02'],
-            [16, 124, '4950971161', 382, '2025-07-02'],
-            [17, 124, '5652911499', 376, '2025-07-02'],
-            [18, 124, '8551323029', 414, '2025-07-02'],
-            [19, 124, '4402104590', 474, '2025-07-02'],
-            [20, 124, '4402104594', 408, '2025-07-02'],
-            [21, 124, '4402104595', 399, '2025-07-02'],
-            [22, 124, '4402104604', 374, '2025-07-02'],
-            [23, 124, '8504059579', 403, '2025-07-02'],
-            [24, 124, '8504059590', 398, '2025-07-02'],
-            [25, 123, '8551782070', 395, '2025-07-02'],
-            [26, 123, '8551782080', 443, '2025-07-02'],
-            [27, 123, '8551782084', 394, '2025-07-02'],
-            [28, 123, '8551782090', 378, '2025-07-02'],
-            [29, 123, '8551782092', 424, '2025-07-02'],
-            [30, 123, '8551782094', 389, '2025-07-02'],
-            [31, 123, '8551782099', 411, '2025-07-02'],
-            [32, 123, '8551323020', 392, '2025-07-02'],
-            [33, 123, '8551323051', 371, '2025-07-02'],
-            [34, 123, '7947673148', 378, '2025-07-02'],
-            [39, 114, '1731177447', 395, '2025-06-19'],
-            [42, 114, '1726167608', 299, '2025-06-19'],
-            [38, 114, '1731177442', 343, '2025-06-19'],
-            [40, 114, '1731177448', 362, '2025-06-19'],
-            [41, 114, '1731177458', 359, '2025-06-19'],
-            [35, 114, '7946282100', 291, '2025-06-19'],
-            [43, 114, '1726167613', 339, '2025-06-19'],
-            [37, 114, '1731177427', 375, '2025-06-19'],
-            [36, 114, '7946282103', 354, '2025-06-19'],
-        ];
-
-        $bovineRepo = $this->entityManager->getRepository(Bovine::class);
-        $caseRepo   = $this->entityManager->getRepository(BuildingCase::class);
-
-        foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
-            $buildingCase = $this->resolveBuildingCaseByLegacyId((int) $legacyCaseId);
-            if (!$buildingCase instanceof BuildingCase) {
-                $buildingCase = $caseRepo->find((int) $legacyCaseId);
-            }
-            if (!$buildingCase instanceof BuildingCase) {
-                $io->warning(sprintf(
-                    'Bovine %s skipped: building_case token %d not found.',
-                    $nationalNumber,
-                    $legacyCaseId
-                ));
-
-                continue;
-            }
-
-            $bovine = $bovineRepo->findOneBy(['nationalNumber' => $nationalNumber]);
-            if (!$bovine instanceof Bovine) {
-                $bovine = new Bovine();
-                ++$this->created;
-            } else {
-                ++$this->updated;
-            }
-
-            $bovine
-                ->setNationalNumber((string) $nationalNumber)
-                ->setBuildingCase($buildingCase)
-                ->setReceivedWeight((int) $receivedWeight)
-                ->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
-            ;
-
-            $this->entityManager->persist($bovine);
-        }
-    }
-
-    /**
-     * @return array<int, array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
-     */
-    private function buildSlotMap(): array
-    {
-        $slots = [];
-
-        for ($column = 1; $column <= 12; ++$column) {
-            $slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column, 'caseNumber' => $column + 12];
-        }
-        for ($column = 14; $column <= 23; ++$column) {
-            $slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column - 1, 'caseNumber' => $column + 11];
-        }
-        for ($column = 1; $column <= 12; ++$column) {
-            $slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 22 + $column, 'caseNumber' => 13 - $column];
-        }
-        for ($column = 14; $column <= 23; ++$column) {
-            $slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 21 + $column, 'caseNumber' => 58 - $column];
-        }
-
-        return $slots;
-    }
-
-    private function resolveBuildingCaseByLegacyId(int $legacyCaseId): ?BuildingCase
-    {
-        if ($legacyCaseId < 1) {
-            return null;
-        }
-
-        $buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
-        $caseNumber     = (($legacyCaseId - 1) % 44) + 1;
-
-        if ($buildingNumber < 1 || $buildingNumber > 3) {
-            return null;
-        }
-
-        $code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
-
-        $buildingCase = $this->entityManager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
-
-        return $buildingCase instanceof BuildingCase ? $buildingCase : null;
-    }
-
-    private function seedBovineTypes(): void
-    {
-        $bovineTypes = [
-            ['label' => 'Limousine', 'code' => '34'],
-            ['label' => 'Charolaise', 'code' => '38'],
-            ['label' => 'Parthenaise', 'code' => '71'],
-        ];
-        foreach ($bovineTypes as $type) {
-            $this->upsertByCode(BovineType::class, $type['code'], static function (BovineType $entity) use ($type) {
-                $entity
-                    ->setLabel($type['label'])
-                    ->setCode($type['code'])
-                ;
-            });
-        }
-    }
-
-    private function seedShipmentTypes(): void
-    {
-        $shipmentTypes = [
-            ['label' => 'Boucherie', 'code' => 'BDB'],
-            ['label' => 'Équarrissage', 'code' => 'BE'],
-        ];
-        foreach ($shipmentTypes as $type) {
-            $this->upsertByCode(ShipmentType::class, $type['code'], static function (ShipmentType $entity) use ($type) {
-                $entity
-                    ->setLabel($type['label'])
-                    ->setCode($type['code'])
-                ;
-            });
-        }
-    }
-
     private function seedSuppliers(): void
     {
         $suppliers = [
@@ -770,130 +458,6 @@ class SeedCommand extends Command
         }
     }
 
-    private function seedCustomers(SymfonyStyle $io): void
-    {
-        $addressRepo = $this->entityManager->getRepository(Address::class);
-        $customers   = [
-            [
-                'name'      => 'ARNAULT EURL',
-                'phone'     => '05.49.02.65.27',
-                'email'     => 'eurl.arnault86@orange.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'ARNAULT EURL',
-                        'street'      => 'Moulin du Guéret',
-                        'street2'     => 'B.P 30425',
-                        'postalCode'  => '86100',
-                        'city'        => 'Antran',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'COVILIM',
-                'phone'     => '05.55.30.03.10',
-                'email'     => 'sandra.robineaux@covilim.com',
-                'addresses' => [
-                    [
-                        'label'       => 'COVILIM',
-                        'street'      => 'Rue de Nexon',
-                        'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'Les producteurs de la marche (LPM)',
-                'phone'     => '05.55.63.04.53',
-                'email'     => 'f.legalliard@lpmcoop.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Malonze',
-                        'street2'     => null,
-                        'postalCode'  => '23300',
-                        'city'        => 'LA SOUTERRAINE',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'LORTHOLARY BETAIL',
-                'phone'     => '05.49.52.77.10',
-                'email'     => 'contact86@lortholarybetail.com',
-                'addresses' => [
-                    [
-                        'label'       => 'LORTHOLARY BETAIL',
-                        'street'      => 'FERME DE GENIEC',
-                        'street2'     => null,
-                        'postalCode'  => '86550',
-                        'city'        => 'MIGNALOUX BEAUVOIR',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'TERRENA',
-                'phone'     => '02.40.98.90.00',
-                'email'     => 'scouillaud@terrena.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'TERRENA',
-                        'street'      => 'LA NOELLE',
-                        'street2'     => 'BP 20199',
-                        'postalCode'  => '44155',
-                        'city'        => 'ANCENIS CEDEX',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-        ];
-
-        foreach ($customers as $customerData) {
-            $customerName = $customerData['name'] ?? $customerData['label'] ?? null;
-            if (!$customerName) {
-                $io->warning('Customer skipped: missing "name".');
-
-                continue;
-            }
-            $customer = $this->upsertByName(Customer::class, $customerName, static function (Customer $customer) use ($customerData, $customerName) {
-                $customer
-                    ->setName($customerName)
-                    ->setPhone($customerData['phone'] ?? null)
-                    ->setEmail($customerData['email'] ?? null)
-                ;
-            });
-
-            $addresses = [];
-            if (isset($customerData['addresses']) && is_array($customerData['addresses'])) {
-                foreach ($customerData['addresses'] as $addressData) {
-                    $addresses[] = $this->upsertAddress($addressData);
-                }
-            } else {
-                // Backward compatibility for older seed format with address ids.
-                $addressIds = $customerData['addressIds'] ?? (isset($customerData['addressId']) ? [$customerData['addressId']] : []);
-                foreach ($addressIds as $addressId) {
-                    $address = $addressRepo->find($addressId);
-                    if (!$address instanceof Address) {
-                        $io->warning(sprintf(
-                            'Customer "%s" skipped address id %d: not found.',
-                            $customerName,
-                            $addressId
-                        ));
-
-                        continue;
-                    }
-                    $addresses[] = $address;
-                }
-            }
-
-            $customer->setAddresses($addresses);
-            $this->entityManager->persist($customer);
-        }
-    }
-
     private function upsertByCode(string $entityClass, string $code, callable $apply): object
     {
         $repo   = $this->entityManager->getRepository($entityClass);

src/DataFixtures/AppFixtures.php

@@ -20,8 +20,7 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
         return [
             TransportFixtures::class,
             ReferenceFixtures::class,
-            BuildingInfrastructureFixtures::class,
-            BovineFixtures::class,
+            SupplierFixtures::class,
             UserFixtures::class,
         ];
     }

src/DataFixtures/BovineFixtures.php

@@ -1,120 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\DataFixtures;
-
-use App\Entity\Bovine;
-use App\Entity\BuildingCase;
-use DateTimeImmutable;
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-
-class BovineFixtures extends Fixture implements DependentFixtureInterface
-{
-    public function load(ObjectManager $manager): void
-    {
-        $rows = [
-            [1, 15, '7979580026', 390, '2026-02-25'],
-            [5, 113, '4405604924', 397, '2025-05-22'],
-            [4, 113, '4405604944', 375, '2025-05-22'],
-            [2, 113, '4963291114', 319, '2025-05-22'],
-            [3, 113, '4405604922', 386, '2025-05-22'],
-            [6, 126, '4415811026', 367, '2025-07-02'],
-            [7, 126, '4950971149', 398, '2025-07-02'],
-            [8, 126, '4950971170', 386, '2025-07-02'],
-            [9, 126, '4489751630', 408, '2025-07-02'],
-            [10, 126, '8551323003', 478, '2025-07-02'],
-            [11, 126, '8503833703', 378, '2025-07-02'],
-            [12, 126, '4402104572', 379, '2025-07-02'],
-            [13, 126, '4402104580', 465, '2025-07-02'],
-            [14, 126, '4402104607', 381, '2025-07-02'],
-            [15, 126, '8504059581', 446, '2025-07-02'],
-            [16, 124, '4950971161', 382, '2025-07-02'],
-            [17, 124, '5652911499', 376, '2025-07-02'],
-            [18, 124, '8551323029', 414, '2025-07-02'],
-            [19, 124, '4402104590', 474, '2025-07-02'],
-            [20, 124, '4402104594', 408, '2025-07-02'],
-            [21, 124, '4402104595', 399, '2025-07-02'],
-            [22, 124, '4402104604', 374, '2025-07-02'],
-            [23, 124, '8504059579', 403, '2025-07-02'],
-            [24, 124, '8504059590', 398, '2025-07-02'],
-            [25, 123, '8551782070', 395, '2025-07-02'],
-            [26, 123, '8551782080', 443, '2025-07-02'],
-            [27, 123, '8551782084', 394, '2025-07-02'],
-            [28, 123, '8551782090', 378, '2025-07-02'],
-            [29, 123, '8551782092', 424, '2025-07-02'],
-            [30, 123, '8551782094', 389, '2025-07-02'],
-            [31, 123, '8551782099', 411, '2025-07-02'],
-            [32, 123, '8551323020', 392, '2025-07-02'],
-            [33, 123, '8551323051', 371, '2025-07-02'],
-            [34, 123, '7947673148', 378, '2025-07-02'],
-            [39, 114, '1731177447', 395, '2025-06-19'],
-            [42, 114, '1726167608', 299, '2025-06-19'],
-            [38, 114, '1731177442', 343, '2025-06-19'],
-            [40, 114, '1731177448', 362, '2025-06-19'],
-            [41, 114, '1731177458', 359, '2025-06-19'],
-            [35, 114, '7946282100', 291, '2025-06-19'],
-            [43, 114, '1726167613', 339, '2025-06-19'],
-            [37, 114, '1731177427', 375, '2025-06-19'],
-            [36, 114, '7946282103', 354, '2025-06-19'],
-        ];
-
-        $bovineRepository = $manager->getRepository(Bovine::class);
-        $caseRepository   = $manager->getRepository(BuildingCase::class);
-
-        foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
-            $buildingCase = $this->resolveBuildingCaseByLegacyId($manager, (int) $legacyCaseId);
-            if (!$buildingCase instanceof BuildingCase) {
-                $buildingCase = $caseRepository->find((int) $legacyCaseId);
-            }
-            if (!$buildingCase instanceof BuildingCase) {
-                continue;
-            }
-
-            /** @var null|Bovine $bovine */
-            $bovine = $bovineRepository->findOneBy(['nationalNumber' => (string) $nationalNumber]);
-            if (!$bovine instanceof Bovine) {
-                $bovine = new Bovine();
-            }
-
-            $bovine
-                ->setNationalNumber((string) $nationalNumber)
-                ->setBuildingCase($buildingCase)
-                ->setReceivedWeight((int) $receivedWeight)
-                ->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
-            ;
-
-            $manager->persist($bovine);
-        }
-
-        $manager->flush();
-    }
-
-    public function getDependencies(): array
-    {
-        return [
-            BuildingInfrastructureFixtures::class,
-        ];
-    }
-
-    private function resolveBuildingCaseByLegacyId(ObjectManager $manager, int $legacyCaseId): ?BuildingCase
-    {
-        if ($legacyCaseId < 1) {
-            return null;
-        }
-
-        $buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
-        $caseNumber     = (($legacyCaseId - 1) % 44) + 1;
-
-        if ($buildingNumber < 1 || $buildingNumber > 3) {
-            return null;
-        }
-
-        $code         = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
-        $buildingCase = $manager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
-
-        return $buildingCase instanceof BuildingCase ? $buildingCase : null;
-    }
-}

src/DataFixtures/BuildingInfrastructureFixtures.php

@@ -1,299 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\DataFixtures;
-
-use App\Entity\Building;
-use App\Entity\BuildingCase;
-use App\Entity\BuildingCasePosition;
-use App\Entity\BuildingLayout;
-use App\Entity\Statut;
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use RuntimeException;
-
-class BuildingInfrastructureFixtures extends Fixture implements DependentFixtureInterface
-{
-    public function load(ObjectManager $manager): void
-    {
-        $statuts   = $this->loadStatuts($manager);
-        $buildings = $this->getBuildingsByCode($manager, ['B1', 'B2', 'B3']);
-        $layouts   = $this->loadLayouts($manager, $buildings);
-        $cases     = $this->loadBuildingCases($manager, $buildings, $statuts);
-        $this->loadCasePositions($manager, $layouts, $cases);
-
-        $manager->flush();
-    }
-
-    public function getDependencies(): array
-    {
-        return [
-            ReferenceFixtures::class,
-        ];
-    }
-
-    /**
-     * @return array<string, Statut>
-     */
-    private function loadStatuts(ObjectManager $manager): array
-    {
-        $repo = $manager->getRepository(Statut::class);
-
-        $data = [
-            ['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
-            ['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
-            ['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
-        ];
-
-        $result = [];
-        foreach ($data as $row) {
-            /** @var null|Statut $statut */
-            $statut = $repo->findOneBy(['code' => $row['code']]);
-            if (!$statut instanceof Statut) {
-                $statut = new Statut()
-                    ->setLabel($row['label'])
-                    ->setCode($row['code'])
-                    ->setColor($row['color'])
-                ;
-                $manager->persist($statut);
-            }
-
-            $result[$row['code']] = $statut;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param list<string> $codes
-     *
-     * @return array<string, Building>
-     */
-    private function getBuildingsByCode(ObjectManager $manager, array $codes): array
-    {
-        $repo   = $manager->getRepository(Building::class);
-        $result = [];
-
-        foreach ($codes as $code) {
-            /** @var null|Building $building */
-            $building = $repo->findOneBy(['code' => $code]);
-            if (!$building instanceof Building) {
-                throw new RuntimeException(sprintf('Building "%s" not found. Load ReferenceFixtures first.', $code));
-            }
-
-            $result[$code] = $building;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param array<string, Building> $buildings
-     *
-     * @return array<string, BuildingLayout>
-     */
-    private function loadLayouts(ObjectManager $manager, array $buildings): array
-    {
-        $repo = $manager->getRepository(BuildingLayout::class);
-
-        $data = [
-            ['name' => 'plan1', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B1'],
-            ['name' => 'plan2', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B2'],
-            ['name' => 'plan3', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B3'],
-        ];
-
-        $result = [];
-        foreach ($data as $row) {
-            /** @var null|BuildingLayout $layout */
-            $layout = $repo->findOneBy(['name' => $row['name']]);
-            if (!$layout instanceof BuildingLayout) {
-                $layout = new BuildingLayout()
-                    ->setName($row['name'])
-                    ->setColumns($row['columns'])
-                    ->setRows($row['rows'])
-                    ->setIdBuilding($buildings[$row['buildingCode']])
-                ;
-                $manager->persist($layout);
-            }
-
-            $result[$row['buildingCode']] = $layout;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param array<string, Building> $buildings
-     * @param array<string, Statut>   $statuts
-     *
-     * @return array<string, BuildingCase>
-     */
-    private function loadBuildingCases(ObjectManager $manager, array $buildings, array $statuts): array
-    {
-        $repo = $manager->getRepository(BuildingCase::class);
-
-        $statusRanges = [
-            // B1
-            ['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'statut' => 'LB'],
-            ['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'statut' => 'OC'],
-            ['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'statut' => 'ML'],
-            ['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'statut' => 'LB'],
-            // B2
-            ['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'statut' => 'OC'],
-            ['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'statut' => 'LB'],
-            ['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'statut' => 'ML'],
-            ['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'statut' => 'OC'],
-            // B3
-            ['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'statut' => 'ML'],
-            ['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'statut' => 'LB'],
-            ['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'statut' => 'OC'],
-            ['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'statut' => 'ML'],
-        ];
-
-        $result = [];
-        foreach ($statusRanges as $range) {
-            for ($caseNumber = $range['from']; $caseNumber <= $range['to']; ++$caseNumber) {
-                $code = sprintf('%s-C%d', $range['buildingCode'], $caseNumber);
-
-                if (isset($result[$code])) {
-                    continue;
-                }
-
-                /** @var null|BuildingCase $buildingCase */
-                $buildingCase = $repo->findOneBy(['code' => $code]);
-                if (!$buildingCase instanceof BuildingCase) {
-                    $buildingCase = new BuildingCase()
-                        ->setCaseNumber($caseNumber)
-                        ->setCode($code)
-                        ->setCapacity(15)
-                        ->setIdBuilding($buildings[$range['buildingCode']])
-                        ->setStatut($statuts[$range['statut']])
-                    ;
-                    $manager->persist($buildingCase);
-                }
-
-                $result[$code] = $buildingCase;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param array<string, BuildingLayout> $layouts
-     * @param array<string, BuildingCase>   $casesByCode
-     */
-    private function loadCasePositions(ObjectManager $manager, array $layouts, array $casesByCode): void
-    {
-        $repo = $manager->getRepository(BuildingCasePosition::class);
-
-        $layoutMap = [
-            'B1' => 'plan1',
-            'B2' => 'plan2',
-            'B3' => 'plan3',
-        ];
-
-        $slots = $this->buildSlotMap();
-
-        foreach ($layoutMap as $buildingCode => $layoutName) {
-            $layout = $layouts[$buildingCode] ?? null;
-            if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
-                throw new RuntimeException(sprintf('Layout "%s" for building "%s" not found.', $layoutName, $buildingCode));
-            }
-
-            foreach ($slots as $slot) {
-                $caseCode     = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
-                $buildingCase = $casesByCode[$caseCode] ?? null;
-
-                if (!$buildingCase instanceof BuildingCase) {
-                    throw new RuntimeException(sprintf('Building case "%s" not found.', $caseCode));
-                }
-
-                /** @var null|BuildingCasePosition $position */
-                $position = $repo->findOneBy([
-                    'buildingLayout' => $layout,
-                    'buildingCase'   => $buildingCase,
-                    'x'              => $slot['x'],
-                    'y'              => $slot['y'],
-                ]);
-
-                if ($position instanceof BuildingCasePosition) {
-                    continue;
-                }
-
-                $position = new BuildingCasePosition()
-                    ->setX($slot['x'])
-                    ->setY($slot['y'])
-                    ->setW($slot['w'])
-                    ->setH($slot['h'])
-                    ->setRenderOrder((string) $slot['renderOrder'])
-                    ->setBuildingLayout($layout)
-                    ->setBuildingCase($buildingCase)
-                ;
-                $manager->persist($position);
-            }
-        }
-    }
-
-    /**
-     * Reproduit le slot_map SQL (44 emplacements sur 2 lignes avec un gap en colonne 13).
-     *
-     * @return list<array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
-     */
-    private function buildSlotMap(): array
-    {
-        $slots = [];
-
-        // Ligne 1, colonnes 1..12 => cases 13..24
-        for ($c = 1; $c <= 12; ++$c) {
-            $slots[] = [
-                'x'           => $c,
-                'y'           => 1,
-                'w'           => 1,
-                'h'           => 1,
-                'renderOrder' => $c,
-                'caseNumber'  => $c + 12,
-            ];
-        }
-
-        // Ligne 1, colonnes 14..23 => cases 25..34
-        for ($c = 14; $c <= 23; ++$c) {
-            $slots[] = [
-                'x'           => $c,
-                'y'           => 1,
-                'w'           => 1,
-                'h'           => 1,
-                'renderOrder' => $c - 1,
-                'caseNumber'  => $c + 11,
-            ];
-        }
-
-        // Ligne 2, colonnes 1..12 => cases 12..1
-        for ($c = 1; $c <= 12; ++$c) {
-            $slots[] = [
-                'x'           => $c,
-                'y'           => 2,
-                'w'           => 1,
-                'h'           => 1,
-                'renderOrder' => 22 + $c,
-                'caseNumber'  => 13 - $c,
-            ];
-        }
-
-        // Ligne 2, colonnes 14..23 => cases 44..35
-        for ($c = 14; $c <= 23; ++$c) {
-            $slots[] = [
-                'x'           => $c,
-                'y'           => 2,
-                'w'           => 1,
-                'h'           => 1,
-                'renderOrder' => 21 + $c,
-                'caseNumber'  => 58 - $c,
-            ];
-        }
-
-        return $slots;
-    }
-}

src/DataFixtures/ReferenceFixtures.php

@@ -5,13 +5,10 @@ declare(strict_types=1);
 namespace App\DataFixtures;
 
 use App\Entity\Address;
-use App\Entity\BovineType;
 use App\Entity\Building;
-use App\Entity\Customer;
 use App\Entity\MerchandiseType;
 use App\Entity\PelletType;
 use App\Entity\ReceptionType;
-use App\Entity\ShipmentType;
 use App\Entity\Supplier;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
@@ -20,13 +17,10 @@ class ReferenceFixtures extends Fixture
 {
     public function load(ObjectManager $manager): void
     {
-        $addressIndex = [];
-
         $merchandiseTypes = [
             ['label' => 'Foin', 'code' => 'FOIN'],
             ['label' => 'Paille', 'code' => 'PAILLE'],
             ['label' => 'Granule', 'code' => 'GRANULE'],
-            ['label' => 'Autres', 'code' => 'AUTRES'],
         ];
         foreach ($merchandiseTypes as $type) {
             $merchandiseType = new MerchandiseType()
@@ -75,31 +69,6 @@ class ReferenceFixtures extends Fixture
             $manager->persist($receptionType);
         }
 
-        $bovineTypes = [
-            ['label' => 'Limousine', 'code' => '34'],
-            ['label' => 'Charolaise', 'code' => '38'],
-            ['label' => 'Parthenaise', 'code' => '71'],
-        ];
-        foreach ($bovineTypes as $type) {
-            $bovineType = new BovineType()
-                ->setLabel($type['label'])
-                ->setCode($type['code'])
-            ;
-            $manager->persist($bovineType);
-        }
-
-        $shipmentTypes = [
-            ['label' => 'Bovin de boucherie', 'code' => 'BDB'],
-            ['label' => "Bovin d'équarrissage", 'code' => 'BE'],
-        ];
-        foreach ($shipmentTypes as $type) {
-            $shipmentType = new ShipmentType()
-                ->setLabel($type['label'])
-                ->setCode($type['code'])
-            ;
-            $manager->persist($shipmentType);
-        }
-
         $suppliers = [
             [
                 'name'      => 'LIOT',
@@ -321,129 +290,21 @@ class ReferenceFixtures extends Fixture
             ;
 
             foreach ($supplierData['addresses'] as $addressData) {
-                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
-                if (!isset($addressIndex[$addressKey])) {
-                    $addressIndex[$addressKey] = new Address()
-                        ->setLabel($addressData['label'])
-                        ->setStreet($addressData['street'])
-                        ->setStreet2($addressData['street2'])
-                        ->setPostalCode($addressData['postalCode'])
-                        ->setCity($addressData['city'])
-                        ->setCountryCode($addressData['countryCode'])
-                    ;
-                    $manager->persist($addressIndex[$addressKey]);
-                }
-                $address = $addressIndex[$addressKey];
+                $address = new Address()
+                    ->setLabel($addressData['label'])
+                    ->setStreet($addressData['street'])
+                    ->setStreet2($addressData['street2'])
+                    ->setPostalCode($addressData['postalCode'])
+                    ->setCity($addressData['city'])
+                    ->setCountryCode($addressData['countryCode'])
+                ;
+                $manager->persist($address);
                 $supplier->getAddresses()->add($address);
             }
 
             $manager->persist($supplier);
         }
 
-        $customers = [
-            [
-                'name'      => 'ARNAULT EURL',
-                'phone'     => '05.49.02.65.27',
-                'email'     => 'eurl.arnault86@orange.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'ARNAULT EURL',
-                        'street'      => 'Moulin du Guéret',
-                        'street2'     => 'B.P 30425',
-                        'postalCode'  => '86100',
-                        'city'        => 'Antran',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'COVILIM',
-                'phone'     => '05.55.30.03.10',
-                'email'     => 'sandra.robineaux@covilim.com',
-                'addresses' => [
-                    [
-                        'label'       => 'COVILIM',
-                        'street'      => 'Rue de Nexon',
-                        'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'Les producteurs de la marche (LPM)',
-                'phone'     => '05.55.63.04.53',
-                'email'     => 'f.legalliard@lpmcoop.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Malonze',
-                        'street2'     => null,
-                        'postalCode'  => '23300',
-                        'city'        => 'LA SOUTERRAINE',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'LORTHOLARY BETAIL',
-                'phone'     => '05.49.52.77.10',
-                'email'     => 'contact86@lortholarybetail.com',
-                'addresses' => [
-                    [
-                        'label'       => 'LORTHOLARY BETAIL',
-                        'street'      => 'FERME DE GENIEC',
-                        'street2'     => null,
-                        'postalCode'  => '86550',
-                        'city'        => 'MIGNALOUX BEAUVOIR',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'TERRENA',
-                'phone'     => '02.40.98.90.00',
-                'email'     => 'scouillaud@terrena.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'TERRENA',
-                        'street'      => 'LA NOELLE',
-                        'street2'     => 'BP 20199',
-                        'postalCode'  => '44155',
-                        'city'        => 'ANCENIS CEDEX',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-        ];
-
-        foreach ($customers as $customerData) {
-            $customer = new Customer()
-                ->setName($customerData['name'])
-                ->setPhone($customerData['phone'])
-                ->setEmail($customerData['email'])
-            ;
-
-            foreach ($customerData['addresses'] as $addressData) {
-                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
-                if (!isset($addressIndex[$addressKey])) {
-                    $addressIndex[$addressKey] = new Address()
-                        ->setLabel($addressData['label'])
-                        ->setStreet($addressData['street'])
-                        ->setStreet2($addressData['street2'])
-                        ->setPostalCode($addressData['postalCode'])
-                        ->setCity($addressData['city'])
-                        ->setCountryCode($addressData['countryCode'])
-                    ;
-                    $manager->persist($addressIndex[$addressKey]);
-                }
-                $customer->getAddresses()->add($addressIndex[$addressKey]);
-            }
-
-            $manager->persist($customer);
-        }
-
         $manager->flush();
     }
 }

src/DataFixtures/SupplierFixtures.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataFixtures;
+
+use App\Entity\Address;
+use App\Entity\Supplier;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+
+class SupplierFixtures extends Fixture
+{
+    public function load(ObjectManager $manager): void
+    {
+        $address = new Address()
+            ->setLabel('LIOT CHATELLERAULT')
+            ->setStreet("14 Allée d'Argenson")
+            ->setStreet2('ZI Nord')
+            ->setPostalCode('86100')
+            ->setCity('CHATELLERAULT')
+            ->setCountryCode('FR')
+        ;
+
+        $supplier = new Supplier()
+            ->setName('LIOT')
+            ->setEmail('lpc.contacts@lpc-liot.fr')
+            ->setPhone('05.49.20.09.10')
+        ;
+
+        $supplier->getAddresses()->add($address);
+
+        $manager->persist($address);
+        $manager->persist($supplier);
+
+        $manager->flush();
+    }
+}

src/DataFixtures/TransportFixtures.php

@@ -15,17 +15,11 @@ class TransportFixtures extends Fixture
 {
     public function load(ObjectManager $manager): void
     {
-        $citerne  = new Truck()->setName('Citerne');
-        $porteur  = new Truck()->setName('Porteur');
-        $plateau  = new Truck()->setName('Plateau');
-        $remorque = new Truck()->setName('Remorque');
-        $benne    = new Truck()->setName('Benne');
+        $citerne = new Truck()->setName('Citerne');
+        $porteur = new Truck()->setName('Porteur');
 
         $manager->persist($citerne);
         $manager->persist($porteur);
-        $manager->persist($plateau);
-        $manager->persist($remorque);
-        $manager->persist($benne);
 
         $liot = new Carrier()
             ->setName('LIOT')

src/Entity/BovinShipment.php

@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
+use ApiPlatform\Metadata\ApiFilter;
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Delete;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ORM\Entity]
+#[ApiFilter(SearchFilter::class, properties: ['shipment' => 'exact'])]
+#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment', columns: ['shipment_id', 'shipment_type_id'])]
+#[ORM\Table(name: 'bovin_shipment')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+        ),
+
+        new Post(
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+            denormalizationContext: ['groups' => ['shipment-bovine:write']],
+        ),
+        new Patch(
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
+            denormalizationContext: ['groups' => ['shipment-bovine:write']],
+        ),
+        new Delete(),
+    ],
+    security: "is_granted('ROLE_USER')",
+)]
+class BovinShipment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment-bovine:read'])]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(inversedBy: 'bovinShipments')]
+    #[Groups(['shipment-bovine:read', 'shipment-bovine:write'])]
+    #[ApiProperty(readableLink: true)]
+    private ?Shipment $shipment = null;
+
+    #[ORM\ManyToOne]
+    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
+    #[ApiProperty(readableLink: true)]
+    private ?ShipmentType $shipmentType = null;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
+    private ?int $nbBovinSend = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getShipment(): ?Shipment
+    {
+        return $this->shipment;
+    }
+
+    public function setShipment(?Shipment $shipment): void
+    {
+        $this->shipment = $shipment;
+    }
+
+    public function getShipmentType(): ?ShipmentType
+    {
+        return $this->shipmentType;
+    }
+
+    public function setShipmentType(?ShipmentType $shipmentType): void
+    {
+        $this->shipmentType = $shipmentType;
+    }
+
+    public function getNbBovinSend(): ?int
+    {
+        return $this->nbBovinSend;
+    }
+
+    public function setNbBovinSend(?int $nbBovinSend): void
+    {
+        $this->nbBovinSend = $nbBovinSend;
+    }
+}

src/Entity/Bovine.php

@@ -1,121 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Patch;
-use ApiPlatform\Metadata\Post;
-use DateTimeImmutable;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Context;
-use Symfony\Component\Serializer\Attribute\Groups;
-use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
-
-#[ORM\Entity]
-#[ORM\Table(name: 'bovine')]
-#[ORM\UniqueConstraint(name: 'uniq_bovine_national_number', columns: ['national_number'])]
-#[ApiResource(
-    operations: [
-        new Get(
-            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['bovine:read']],
-        ),
-        new GetCollection(
-            normalizationContext: ['groups' => ['bovine:read']],
-        ),
-        new Post(
-            normalizationContext: ['groups' => ['bovine:read']],
-            denormalizationContext: ['groups' => ['bovine:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
-        new Patch(
-            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['bovine:read']],
-            denormalizationContext: ['groups' => ['bovine:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
-    ],
-    security: "is_granted('ROLE_USER')",
-)]
-class Bovine
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['bovine:read'])]
-    private ?int $id = null;
-
-    #[ORM\Column(length: 50)]
-    #[Groups(['bovine:read', 'bovine:write'])]
-    private string $nationalNumber = '';
-
-    #[ORM\Column(nullable: true)]
-    #[Groups(['bovine:read', 'bovine:write'])]
-    private ?int $receivedWeight = null;
-
-    #[ORM\Column(type: 'date_immutable', nullable: true)]
-    #[Groups(['bovine:read', 'bovine:write'])]
-    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
-    private ?DateTimeImmutable $arrivalDate = null;
-
-    #[ORM\ManyToOne(inversedBy: 'bovines')]
-    #[Groups(['bovine:read', 'bovine:write'])]
-    private ?BuildingCase $buildingCase = null;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getNationalNumber(): string
-    {
-        return $this->nationalNumber;
-    }
-
-    public function setNationalNumber(string $nationalNumber): static
-    {
-        $this->nationalNumber = $nationalNumber;
-
-        return $this;
-    }
-
-    public function getReceivedWeight(): ?int
-    {
-        return $this->receivedWeight;
-    }
-
-    public function setReceivedWeight(?int $receivedWeight): static
-    {
-        $this->receivedWeight = $receivedWeight;
-
-        return $this;
-    }
-
-    public function getArrivalDate(): ?DateTimeImmutable
-    {
-        return $this->arrivalDate;
-    }
-
-    public function setArrivalDate(?DateTimeImmutable $arrivalDate): static
-    {
-        $this->arrivalDate = $arrivalDate;
-
-        return $this;
-    }
-
-    public function getBuildingCase(): ?BuildingCase
-    {
-        return $this->buildingCase;
-    }
-
-    public function setBuildingCase(?BuildingCase $buildingCase): static
-    {
-        $this->buildingCase = $buildingCase;
-
-        return $this;
-    }
-}

src/Entity/BovineType.php

@@ -7,8 +7,6 @@ namespace App\Entity;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Patch;
-use ApiPlatform\Metadata\Post;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -22,17 +20,6 @@ use Symfony\Component\Serializer\Attribute\Groups;
         new GetCollection(
             normalizationContext: ['groups' => ['bovine-type:read']],
         ),
-        new Post(
-            normalizationContext: ['groups' => ['bovine-type:read']],
-            denormalizationContext: ['groups' => ['bovine-type:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
-        new Patch(
-            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['bovine-type:read']],
-            denormalizationContext: ['groups' => ['bovine-type:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
     ],
     security: "is_granted('ROLE_USER')",
 )]
@@ -45,11 +32,11 @@ class BovineType
     private ?int $id = null;
 
     #[ORM\Column(length: 120)]
-    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
+    #[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
     private ?string $label = null;
 
     #[ORM\Column(length: 50)]
-    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
+    #[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
     private ?string $code = null;
 
     public function getId(): ?int

src/Entity/Building.php

@@ -11,7 +11,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
-use Symfony\Component\Serializer\Attribute\SerializedName;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'building')]
@@ -49,25 +48,9 @@ class Building
     #[ORM\ManyToMany(targetEntity: Reception::class, mappedBy: 'buildings')]
     private Collection $receptions;
 
-    /**
-     * @var Collection<int, BuildingCase>
-     */
-    #[ORM\OneToMany(targetEntity: BuildingCase::class, mappedBy: 'id_building')]
-    private Collection $buildingCases;
-
-    /**
-     * @var Collection<int, BuildingLayout>
-     */
-    #[ORM\OneToMany(targetEntity: BuildingLayout::class, mappedBy: 'id_building')]
-    #[Groups(['building:read'])]
-    #[SerializedName('layouts')]
-    private Collection $buildingLayout;
-
     public function __construct()
     {
-        $this->receptions     = new ArrayCollection();
-        $this->buildingCases  = new ArrayCollection();
-        $this->buildingLayout = new ArrayCollection();
+        $this->receptions = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -106,41 +89,4 @@ class Building
     {
         return $this->receptions;
     }
-
-    /**
-     * @return Collection<int, BuildingCase>
-     */
-    public function getBuildingCases(): Collection
-    {
-        return $this->buildingCases;
-    }
-
-    public function addBuildingCase(BuildingCase $buildingCase): static
-    {
-        if (!$this->buildingCases->contains($buildingCase)) {
-            $this->buildingCases->add($buildingCase);
-            $buildingCase->setIdBuilding($this);
-        }
-
-        return $this;
-    }
-
-    public function removeBuildingCase(BuildingCase $buildingCase): static
-    {
-        if ($this->buildingCases->removeElement($buildingCase)) {
-            if ($buildingCase->getIdBuilding() === $this) {
-                $buildingCase->setIdBuilding(null);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, BuildingLayout>
-     */
-    public function getBuildingLayout(): Collection
-    {
-        return $this->buildingLayout;
-    }
 }

src/Entity/BuildingCase.php

@@ -1,209 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\OpenApi\Model\Operation as OpenApiOperation;
-use App\State\BuildingCaseWeightsReportProvider;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Groups;
-use Symfony\Component\Serializer\Attribute\SerializedName;
-
-#[ORM\Entity]
-#[ApiResource(
-    operations: [
-        new Get(
-            uriTemplate: '/building_cases/{id}/weights-report',
-            requirements: ['id' => '\d+'],
-            openapi: new OpenApiOperation(
-                summary: 'Render case weights report',
-                description: 'Returns a PDF report of bovines stored in the selected case.',
-            ),
-            output: false,
-            provider: BuildingCaseWeightsReportProvider::class,
-        ),
-    ],
-    security: "is_granted('ROLE_USER')",
-)]
-class BuildingCase
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $id = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    #[SerializedName('caseNumber')]
-    private ?int $case_number = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['building:read'])]
-    private ?string $code = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $capacity = null;
-
-    /**
-     * @var Collection<int, BuildingCasePosition>
-     */
-    #[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingCase')]
-    private Collection $id_case_position;
-
-    #[ORM\ManyToOne(inversedBy: 'buildingCases')]
-    private ?Building $id_building = null;
-
-    #[ORM\ManyToOne(inversedBy: 'id_case')]
-    #[Groups(['building:read'])]
-    private ?Statut $statut = null;
-
-    /**
-     * @var Collection<int, Bovine>
-     */
-    #[ORM\OneToMany(targetEntity: Bovine::class, mappedBy: 'buildingCase')]
-    private Collection $bovines;
-
-    public function __construct()
-    {
-        $this->id_case_position = new ArrayCollection();
-        $this->bovines          = new ArrayCollection();
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function setId(int $id): static
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    public function getCaseNumber(): ?int
-    {
-        return $this->case_number;
-    }
-
-    public function setCaseNumber(int $case_number): static
-    {
-        $this->case_number = $case_number;
-
-        return $this;
-    }
-
-    public function getCode(): ?string
-    {
-        return $this->code;
-    }
-
-    public function setCode(string $code): static
-    {
-        $this->code = $code;
-
-        return $this;
-    }
-
-    public function getCapacity(): ?int
-    {
-        return $this->capacity;
-    }
-
-    public function setCapacity(int $capacity): static
-    {
-        $this->capacity = $capacity;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, BuildingCasePosition>
-     */
-    public function getIdCasePosition(): Collection
-    {
-        return $this->id_case_position;
-    }
-
-    public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
-    {
-        if (!$this->id_case_position->contains($idCasePosition)) {
-            $this->id_case_position->add($idCasePosition);
-            $idCasePosition->setBuildingCase($this);
-        }
-
-        return $this;
-    }
-
-    public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
-    {
-        if ($this->id_case_position->removeElement($idCasePosition)) {
-            // set the owning side to null (unless already changed)
-            if ($idCasePosition->getBuildingCase() === $this) {
-                $idCasePosition->setBuildingCase(null);
-            }
-        }
-
-        return $this;
-    }
-
-    public function getIdBuilding(): ?Building
-    {
-        return $this->id_building;
-    }
-
-    public function setIdBuilding(?Building $id_building): static
-    {
-        $this->id_building = $id_building;
-
-        return $this;
-    }
-
-    public function getStatut(): ?Statut
-    {
-        return $this->statut;
-    }
-
-    public function setStatut(?Statut $statut): static
-    {
-        $this->statut = $statut;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, Bovine>
-     */
-    public function getBovines(): Collection
-    {
-        return $this->bovines;
-    }
-
-    public function addBovine(Bovine $bovine): static
-    {
-        if (!$this->bovines->contains($bovine)) {
-            $this->bovines->add($bovine);
-            $bovine->setBuildingCase($this);
-        }
-
-        return $this;
-    }
-
-    public function removeBovine(Bovine $bovine): static
-    {
-        if ($this->bovines->removeElement($bovine)) {
-            if ($bovine->getBuildingCase() === $this) {
-                $bovine->setBuildingCase(null);
-            }
-        }
-
-        return $this;
-    }
-}

src/Entity/BuildingCasePosition.php

@@ -1,145 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Groups;
-use Symfony\Component\Serializer\Attribute\SerializedName;
-
-#[ORM\Entity]
-class BuildingCasePosition
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $id = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $x = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $y = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $w = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $h = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['building:read'])]
-    #[SerializedName('renderOrder')]
-    private ?string $render_order = null;
-
-    #[ORM\ManyToOne(inversedBy: 'id_case_position')]
-    #[ORM\JoinColumn(nullable: false)]
-    private ?BuildingLayout $buildingLayout = null;
-
-    #[ORM\ManyToOne(inversedBy: 'id_case_position')]
-    #[ORM\JoinColumn(nullable: false)]
-    #[Groups(['building:read'])]
-    private ?BuildingCase $buildingCase = null;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function setId(int $id): static
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    public function getX(): ?int
-    {
-        return $this->x;
-    }
-
-    public function setX(int $x): static
-    {
-        $this->x = $x;
-
-        return $this;
-    }
-
-    public function getY(): ?int
-    {
-        return $this->y;
-    }
-
-    public function setY(int $y): static
-    {
-        $this->y = $y;
-
-        return $this;
-    }
-
-    public function getW(): ?int
-    {
-        return $this->w;
-    }
-
-    public function setW(int $w): static
-    {
-        $this->w = $w;
-
-        return $this;
-    }
-
-    public function getH(): ?int
-    {
-        return $this->h;
-    }
-
-    public function setH(int $h): static
-    {
-        $this->h = $h;
-
-        return $this;
-    }
-
-    public function getRenderOrder(): ?string
-    {
-        return $this->render_order;
-    }
-
-    public function setRenderOrder(string $render_order): static
-    {
-        $this->render_order = $render_order;
-
-        return $this;
-    }
-
-    public function getBuildingLayout(): ?BuildingLayout
-    {
-        return $this->buildingLayout;
-    }
-
-    public function setBuildingLayout(?BuildingLayout $buildingLayout): static
-    {
-        $this->buildingLayout = $buildingLayout;
-
-        return $this;
-    }
-
-    public function getBuildingCase(): ?BuildingCase
-    {
-        return $this->buildingCase;
-    }
-
-    public function setBuildingCase(?BuildingCase $buildingCase): static
-    {
-        $this->buildingCase = $buildingCase;
-
-        return $this;
-    }
-}

src/Entity/BuildingLayout.php

@@ -1,140 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Groups;
-use Symfony\Component\Serializer\Attribute\SerializedName;
-
-#[ORM\Entity]
-class BuildingLayout
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $id = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['building:read'])]
-    private ?string $name = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $columns = null;
-
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $rows = null;
-
-    #[ORM\ManyToOne(inversedBy: 'buildingLayout')]
-    #[ORM\JoinColumn(nullable: false)]
-    private ?Building $id_building = null;
-
-    /**
-     * @var Collection<int, BuildingCasePosition>
-     */
-    #[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingLayout')]
-    #[Groups(['building:read'])]
-    #[SerializedName('casePositions')]
-    private Collection $id_case_position;
-
-    public function __construct()
-    {
-        $this->id_case_position = new ArrayCollection();
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function setId(int $id): static
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getColumns(): ?int
-    {
-        return $this->columns;
-    }
-
-    public function setColumns(int $columns): static
-    {
-        $this->columns = $columns;
-
-        return $this;
-    }
-
-    public function getRows(): ?int
-    {
-        return $this->rows;
-    }
-
-    public function setRows(int $rows): static
-    {
-        $this->rows = $rows;
-
-        return $this;
-    }
-
-    public function getIdBuilding(): ?Building
-    {
-        return $this->id_building;
-    }
-
-    public function setIdBuilding(?Building $id_building): static
-    {
-        $this->id_building = $id_building;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, BuildingCasePosition>
-     */
-    public function getIdCasePosition(): Collection
-    {
-        return $this->id_case_position;
-    }
-
-    public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
-    {
-        if (!$this->id_case_position->contains($idCasePosition)) {
-            $this->id_case_position->add($idCasePosition);
-            $idCasePosition->setBuildingLayout($this);
-        }
-
-        return $this;
-    }
-
-    public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
-    {
-        if ($this->id_case_position->removeElement($idCasePosition)) {
-            // set the owning side to null (unless already changed)
-            if ($idCasePosition->getBuildingLayout() === $this) {
-                $idCasePosition->setBuildingLayout(null);
-            }
-        }
-
-        return $this;
-    }
-}

src/Entity/Customer.php

@@ -47,17 +47,13 @@ class Customer
     #[Groups(['shipment:read', 'customer:read'])]
     private ?int $id = null;
 
-    #[ORM\Column(length: 180)]
+    #[ORM\Column(length: 255)]
     #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private string $name = '';
+    private ?string $label = null;
 
-    #[ORM\Column(length: 180, nullable: true)]
+    #[ORM\Column(length: 255)]
     #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private ?string $email = null;
-
-    #[ORM\Column(length: 40, nullable: true)]
-    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private ?string $phone = null;
+    private ?string $code = null;
 
     /**
      * @var Collection<int, Address>
@@ -78,40 +74,24 @@ class Customer
         return $this->id;
     }
 
-    public function getName(): string
+    public function getLabel(): ?string
     {
-        return $this->name;
+        return $this->label;
     }
 
-    public function setName(string $name): self
+    public function setLabel(?string $label): void
     {
-        $this->name = $name;
-
-        return $this;
+        $this->label = $label;
     }
 
-    public function getEmail(): ?string
+    public function getCode(): ?string
     {
-        return $this->email;
+        return $this->code;
     }
 
-    public function setEmail(?string $email): self
+    public function setCode(?string $code): void
     {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    public function getPhone(): ?string
-    {
-        return $this->phone;
-    }
-
-    public function setPhone(?string $phone): self
-    {
-        $this->phone = $phone;
-
-        return $this;
+        $this->code = $code;
     }
 
     public function getAddresses(): Collection

src/Entity/Shipment.php

@@ -80,7 +80,7 @@ class Shipment
 
     #[ORM\Column(length: 255)]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?string $licensePlate = null;
+    private ?string $licencePlate = null;
 
     #[ORM\Column(length: 20, unique: true, nullable: true)]
     #[Groups(['shipment:read'])]
@@ -123,15 +123,17 @@ class Shipment
     #[ApiProperty(readableLink: true)]
     private ?Customer $customer = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipments')]
-    #[ORM\JoinColumn(nullable: true)]
+    /**
+     * @var Collection<int, BovinShipment>
+     */
+    #[ORM\OneToMany(
+        targetEntity: BovinShipment::class,
+        mappedBy: 'shipment',
+        cascade: ['persist', 'remove'],
+        orphanRemoval: true
+    )]
     #[Groups(['shipment:read', 'shipment:write'])]
-    #[ApiProperty(readableLink: true)]
-    private ?ShipmentType $shipmentType = null;
-
-    #[ORM\Column]
-    #[Groups(['shipment:read', 'shipment:write'])]
-    private int $nbBovinSend = 0;
+    private Collection $bovinShipments;
 
     /**
      * @var Collection<int, Weight>
@@ -154,7 +156,8 @@ class Shipment
 
     public function __construct()
     {
-        $this->weights = new ArrayCollection();
+        $this->bovinShipments = new ArrayCollection();
+        $this->weights        = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -162,14 +165,14 @@ class Shipment
         return $this->id;
     }
 
-    public function getLicensePlate(): ?string
+    public function getLicencePlate(): ?string
     {
-        return $this->licensePlate;
+        return $this->licencePlate;
     }
 
-    public function setLicensePlate(?string $licensePlate): void
+    public function setLicencePlate(?string $licencePlate): void
     {
-        $this->licensePlate = $licensePlate;
+        $this->licencePlate = $licencePlate;
     }
 
     public function getIdentificationNumber(): ?string
@@ -192,26 +195,6 @@ class Shipment
         $this->currentStep = $currentStep;
     }
 
-    public function getShipmentType(): ?ShipmentType
-    {
-        return $this->shipmentType;
-    }
-
-    public function setShipmentType(?ShipmentType $shipmentType): void
-    {
-        $this->shipmentType = $shipmentType;
-    }
-
-    public function getNbBovinSend(): int
-    {
-        return $this->nbBovinSend;
-    }
-
-    public function setNbBovinSend(int $nbBovinSend): void
-    {
-        $this->nbBovinSend = $nbBovinSend;
-    }
-
     public function getIsValid(): ?bool
     {
         return $this->isValid;
@@ -278,6 +261,37 @@ class Shipment
         $this->customer = $customer;
     }
 
+    public function getBovinShipments(): Collection
+    {
+        return $this->bovinShipments;
+    }
+
+    public function setBovinShipments(Collection $bovinShipments): void
+    {
+        $this->bovinShipments = $bovinShipments;
+    }
+
+    public function addBovinShipment(BovinShipment $bovinShipment): self
+    {
+        if (!$this->bovinShipments->contains($bovinShipment)) {
+            $this->bovinShipments->add($bovinShipment);
+            $bovinShipment->setShipment($this);
+        }
+
+        return $this;
+    }
+
+    public function removeBovinShipment(BovinShipment $bovinShipment): self
+    {
+        if ($this->bovinShipments->removeElement($bovinShipment)) {
+            if ($bovinShipment->getShipment() === $this) {
+                $bovinShipment->setShipment(null);
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * @return Collection<int, Weight>
      */
@@ -314,7 +328,7 @@ class Shipment
             return;
         }
 
-        $number                     = sprintf('P-BL-%04d', $this->id);
+        $number                     = sprintf('P-BR-%04d', $this->id);
         $this->identificationNumber = $number;
 
         $args->getObjectManager()

src/Entity/ShipmentType.php

@@ -7,8 +7,6 @@ namespace App\Entity;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -42,14 +40,6 @@ class ShipmentType
     #[Groups(['shipment-type:read', 'shipment:read'])]
     private ?string $code = null;
 
-    #[ORM\OneToMany(mappedBy: 'shipmentType', targetEntity: Shipment::class)]
-    private Collection $shipments;
-
-    public function __construct()
-    {
-        $this->shipments = new ArrayCollection();
-    }
-
     public function getId(): ?int
     {
         return $this->id;

src/Entity/Statut.php

@@ -1,138 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\GetCollection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Groups;
-use Symfony\Component\Serializer\Attribute\SerializedName;
-
-#[ORM\Entity]
-#[ApiResource(
-    operations: [
-        new Get(
-            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['building:read']],
-        ),
-        new GetCollection(
-            normalizationContext: ['groups' => ['building:read']],
-        ),
-    ],
-    security: "is_granted('ROLE_USER')",
-)]
-class Statut
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['building:read'])]
-    private ?int $id = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['building:read'])]
-    private ?string $label = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['building:read'])]
-    private ?string $code = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['building:read'])]
-    #[SerializedName('couleur')]
-    private ?string $color = null;
-
-    /**
-     * @var Collection<int, BuildingCase>
-     */
-    #[ORM\OneToMany(targetEntity: BuildingCase::class, mappedBy: 'statut')]
-    private Collection $id_case;
-
-    public function __construct()
-    {
-        $this->id_case = new ArrayCollection();
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function setId(int $id): static
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    public function getLabel(): ?string
-    {
-        return $this->label;
-    }
-
-    public function setLabel(string $label): static
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    public function getCode(): ?string
-    {
-        return $this->code;
-    }
-
-    public function setCode(string $code): static
-    {
-        $this->code = $code;
-
-        return $this;
-    }
-
-    public function getColor(): ?string
-    {
-        return $this->color;
-    }
-
-    public function setColor(string $color): static
-    {
-        $this->color = $color;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, BuildingCase>
-     */
-    public function getIdCase(): Collection
-    {
-        return $this->id_case;
-    }
-
-    public function addIdCase(BuildingCase $idCase): static
-    {
-        if (!$this->id_case->contains($idCase)) {
-            $this->id_case->add($idCase);
-            $idCase->setStatut($this);
-        }
-
-        return $this;
-    }
-
-    public function removeIdCase(BuildingCase $idCase): static
-    {
-        if ($this->id_case->removeElement($idCase)) {
-            // set the owning side to null (unless already changed)
-            if ($idCase->getStatut() === $this) {
-                $idCase->setStatut(null);
-            }
-        }
-
-        return $this;
-    }
-}

src/Entity/Supplier.php

@@ -26,7 +26,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
         ),
         new GetCollection(
             normalizationContext: ['groups' => ['supplier:read']],
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
         ),
         new Post(
             normalizationContext: ['groups' => ['supplier:read']],