CHANGELOG.md

@@ -51,7 +51,7 @@ Ajouter dans le fichier .env du frontend
 * Creation page admin ajout/modification bovins
 * [#331] Mettre à jour l'entité Shipment et bovin_shipment
 * [#278] Plan du site
-
+* [#334] Correctifs
 ### Changed
 
 ### Fixed

frontend/components/address.vue

@@ -8,11 +8,12 @@
             </div>
 
             <button
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                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"
                 type="submit"
                 :disabled="isLoading"
             >
-                {{ props.address? "Sauvegarder" : "Ajouter" }}
+                <Icon :name="props.address ? 'mdi:check' : 'mdi:plus'" size="28" />
+                {{ props.address? "Valider" : "Ajouter" }}
             </button>
         </div>
 
@@ -22,7 +23,7 @@
             <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" />
+            <UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
         </div>
     </form>
 </template>

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

@@ -27,11 +27,14 @@
                 />
             </div>
         </div>
-        <button
+        <div class="flex justify-center">
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            <UiButton
-            @click="goNext"
+                type="submit"
-        >Valider
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-        </button>
+                @click="goNext"
+            >Valider
+            </UiButton>
+        </div>
     </div>
 </template>
 <script setup lang="ts">

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

@@ -64,11 +64,14 @@
                 </div>
             </div>
         </div>
-        <button
+        <div class="flex justify-center">
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            <UiButton
-            @click="goNext"
+                type="submit"
-        >Valider
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-        </button>
+                @click="goNext"
+            >Valider
+            </UiButton>
+        </div>
     </div>
 </template>
 

frontend/components/shipment/shipment-form.vue

@@ -92,7 +92,7 @@
             <!-- Plaque d'immatriculation (hors LIOT)        -->
             <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
-                    v-model="form.licencePlate"
+                    v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
                 />
             </div>
@@ -193,7 +193,7 @@ const form = reactive<ShipmentFormData>({
     carrierId: '',
     driverId: '',
     vehicleId: '',
-    licencePlate: '',
+    licensePlate: '',
 })
 // Adresses liées au client sélectionné
 const customerAddresses = computed<AddressData[]>(() => {
@@ -315,7 +315,7 @@ watch(
     () => shipmentStore.current,
     (shipment) => {
         isHydrating.value = true
-        form.licencePlate = shipment?.licencePlate ?? ''
+        form.licensePlate = shipment?.licensePlate ?? ''
         form.shipmentDate = shipment?.shipmentDate ?? new Date().toISOString().slice(0, 10)
         form.userId = shipment?.user?.id ? String(shipment.user.id) :
             form.userId
@@ -441,19 +441,19 @@ watch(
             (vehicle) => String(vehicle.id) === form.vehicleId
         )
         if (selected) {
-            form.licencePlate = selected.plate
+            form.licensePlate = selected.plate
             allowAnyLicensePlate.value = false
         }
     }
 )
 watch(
-    () => [form.licencePlate, form.carrierId, vehicles.value],
+    () => [form.licensePlate, form.carrierId, vehicles.value],
     () => {
         if (!isLiotCarrier.value || form.vehicleId) {
             return
         }
         const match = filteredVehicles.value.find(
-            (vehicle) => vehicle.plate === form.licencePlate
+            (vehicle) => vehicle.plate === form.licensePlate
         )
         if (match) {
             form.vehicleId = String(match.id)
@@ -462,7 +462,7 @@ watch(
 )
 
 const buildPayload = () => {
-    const normalizedLicensePlate = form.licencePlate.trim()
+    const normalizedLicensePlate = form.licensePlate.trim()
     const normalizedShipmentDate = form.shipmentDate.trim()
     const normalizedCustomerId = form.customerId.trim()
     const normalizedTruckId = form.truckId.trim()
@@ -498,7 +498,7 @@ const buildPayload = () => {
         Math.trunc(rawQuantity)) : 0
 
     return {
-        licencePlate: normalizedLicensePlate,
+        licensePlate: normalizedLicensePlate,
         shipmentDate: normalizedShipmentDate,
         customer: customerIri,
         truck: truckIri,

frontend/components/shipment/shipment-weight.vue

@@ -75,7 +75,7 @@ const printReceipt = async () => {
 
     await saveWeight()
     const shipment = shipmentStore.current
-    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licencePlate ?? 'immat'}.pdf`
+    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licensePlate ?? 'immat'}.pdf`
     await printPdf(`/shipments/${shipment.id}/receipt`, filename)
 
     // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.

frontend/composables/useWeighing.ts

@@ -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 à plein' : 'Pesée à vide'))
+    const title = computed(() => (modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein'))
     const showLoadingBox = computed(
         () => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
     )

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

@@ -8,10 +8,10 @@
             <UiButton
                 type="submit"
                 :disabled="isLoading || isHydrating"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] hover:opacity-80"
+                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:check" size="28" />
+                <Icon :name="isEdit ? 'mdi:check' : 'mdi:plus'" size="28" />
-                {{ isEdit ? 'Modifier' : 'Ajouter' }}
+                {{ isEdit ? 'Valider' : 'Ajouter' }}
             </UiButton>
         </div>
 

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

@@ -8,8 +8,10 @@
 
         <UiButton
             type="submit"
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+            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"
-        >Enregistrer
+        >
+            <Icon name="mdi:check" size="28" />
+            Valider
         </UiButton>
     </div>
 
@@ -52,10 +54,6 @@ const form = reactive<CarrierFormData>({
     name:''
 })
 
-definePageMeta({
-    layout: 'default'
-})
-
 const hydrateFromUser = (carrier: CarrierData | null) => {
     if (!carrier) {
         return

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

@@ -4,7 +4,7 @@
             <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
             <NuxtLink
                 to="/admin/carrier"
-                class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
+                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
@@ -43,10 +43,6 @@ const goToCarrier = (id: number) => {
     router.push(`/admin/carrier/${id}`)
 }
 
-definePageMeta({
-    layout: 'default'
-})
-
 onMounted(async () => {
     carrierList.value = await getCarrierList(false)
 })

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

@@ -6,11 +6,12 @@
             </h1>
 
             <UiButton
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                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"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
-                {{ customerId ? "Sauvegarder" : "Ajouter" }}
+                <Icon :name="customerId ? 'mdi:check' : 'mdi:plus'" size="28" />
+                {{ customerId ? "Valider" : "Ajouter" }}
             </UiButton>
         </div>
 
@@ -25,10 +26,11 @@
             <h2 class="text-3xl font-bold uppercase">Adresses client</h2>
             <UiButton
                 type="button"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                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"
                 :disabled="customerId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
+                <Icon name="mdi:plus" size="28" />
                 Ajouter
             </UiButton>
         </div>
@@ -80,8 +82,6 @@ import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
 import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
 import {useAuthStore} from "~/stores/auth"
 
-definePageMeta({layout: "default"})
-
 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()

frontend/pages/admin/customer/address.vue

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

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

@@ -3,7 +3,7 @@
         <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
         <NuxtLink
             to="/admin/customer"
-            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
+            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="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
@@ -94,8 +94,6 @@ import { getCustomerList } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 import { useAuthStore } from "~/stores/auth"
 
-definePageMeta({ layout: "default" })
-
 const customerList = ref<CustomerData[]>([])
 const router = useRouter()
 const auth = useAuthStore()

frontend/pages/admin/dashboard.vue

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

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

@@ -6,11 +6,12 @@
             </h1>
 
             <UiButton
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                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"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
-                {{ supplierId ? "Sauvegarder" : "Ajouter" }}
+                <Icon :name="supplierId ? 'mdi:check' : 'mdi:plus'" size="28" />
+                {{ supplierId ? "Valider" : "Ajouter" }}
             </UiButton>
         </div>
 
@@ -25,10 +26,11 @@
             <h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
             <UiButton
                 type="button"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                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"
                 :disabled="supplierId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
+                <Icon name="mdi:plus" size="28" />
                 Ajouter
             </UiButton>
         </div>
@@ -80,8 +82,6 @@ import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
 import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
 import {useAuthStore} from "~/stores/auth"
 
-definePageMeta({layout: "default"})
-
 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()

frontend/pages/admin/supplier/address.vue

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

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

@@ -3,7 +3,7 @@
         <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
         <NuxtLink
             to="/admin/supplier"
-            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
+            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="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
@@ -90,8 +90,6 @@ import { getSupplierList } from "~/services/supplier"
 import type { SupplierData } from "~/services/dto/supplier-data"
 import { useAuthStore } from "~/stores/auth"
 
-definePageMeta({ layout: "default" })
-
 const supplierList = ref<SupplierData[]>([])
 const router = useRouter()
 const auth = useAuthStore()

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

@@ -6,10 +6,11 @@
                 {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
             </h1>
             <UiButton
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                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"
                 type="submit"
             >
-                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
+                <Icon :name="userId ? 'mdi:check' : 'mdi:plus'" size="28" />
+                {{ userId ? 'Valider' : 'Ajouter' }}
             </UiButton>
         </div>
 
@@ -38,10 +39,6 @@
     </form>
 </template>
 <script setup lang="ts">
-definePageMeta({
-    layout: 'default'
-})
-
 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

@@ -2,8 +2,8 @@
     <div class="flex items-center justify-between">
         <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
         <NuxtLink
-            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
+            to="/admin/user"
-            @click="router.push('/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"
         >
             <Icon name="mdi:plus" size="28"  />
             Ajouter
@@ -38,10 +38,6 @@
 
 
 <script setup lang="ts">
-definePageMeta({
-    layout: 'default'
-})
-
 import type {UserData} from "~/services/dto/user-data";
 import {getAdminUsers} from "~/services/auth";
 import {ROLE} from "~/utils/constants";

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

@@ -118,10 +118,10 @@
             <UiButton
                 v-if="auth.isAdmin"
                 type="submit"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
+                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 mb-16"
-
             >
-                Enregistrer
+                <Icon name="mdi:check" size="28" />
+                Valider
             </UiButton>
         </div>
             <div class="flex justify-evenly gap-y-8 gap-x-40 mb-8 border-b border-slate-400">

frontend/pages/shipment/waiting-shipment.vue

@@ -38,7 +38,7 @@
                     </template>
                 </div>
                 <div>{{ shipment.carrier?.name }}</div>
-                <div>{{ shipment.licencePlate }}</div>
+                <div>{{ shipment.licensePlate }}</div>
             </div>
         </div>
     </div>

frontend/services/dto/shipment-data.ts

@@ -12,7 +12,7 @@ export interface ShipmentTypeData {
 export type ShipmentData = {
     id: number
     identificationNumber?: string | null
-    licencePlate: string | null
+    licensePlate: string | null
     shipmentDate: string
     currentStep: number
     isValid: boolean
@@ -43,11 +43,11 @@ export type ShipmentFormData = {
     carrierId: string,
     driverId: string,
     vehicleId: string,
-    licencePlate: string,
+    licensePlate: string,
 }
 
 export type ShipmentPayload = {
-    licencePlate?: string | null
+    licensePlate?: string | null
     shipmentDate?: string
     currentStep?: number
     isValid?: boolean

migrations/Version20260225110000.php

@@ -0,0 +1,26 @@
+<?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');
+    }
+}

src/Entity/Shipment.php

@@ -80,7 +80,7 @@ class Shipment
 
     #[ORM\Column(length: 255)]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?string $licencePlate = null;
+    private ?string $licensePlate = null;
 
     #[ORM\Column(length: 20, unique: true, nullable: true)]
     #[Groups(['shipment:read'])]
@@ -162,14 +162,14 @@ class Shipment
         return $this->id;
     }
 
-    public function getLicencePlate(): ?string
+    public function getLicensePlate(): ?string
     {
-        return $this->licencePlate;
+        return $this->licensePlate;
     }
 
-    public function setLicencePlate(?string $licencePlate): void
+    public function setLicensePlate(?string $licensePlate): void
     {
-        $this->licencePlate = $licencePlate;
+        $this->licensePlate = $licensePlate;
     }
 
     public function getIdentificationNumber(): ?string

templates/shipment_voucher.html.twig

@@ -275,7 +275,7 @@
             <div class="meta">
                 <p>Transporteur : {{ shipment.carrier ? shipment.carrier.name : '-' }}</p>
                 <p>Mode d'expédition : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
-                <p>Immatriculation : {{ shipment.licencePlate ?? '-' }}</p>
+                <p>Immatriculation : {{ shipment.licensePlate ?? '-' }}</p>
             </div>
         </td>