Merge branch 'develop' into feat/317-admin-modification-creation-transporteur

# Conflicts:
#	.idea/workspace.xml
#	CHANGELOG.md
#	frontend/pages/admin/carrier/carrier-list.vue

.idea/workspace.xml

@@ -4,16 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : test auto-tag-develop.yml (auto incrément version)">
-      <change afterPath="$PROJECT_DIR$/frontend/composables/useAppVersion.ts" afterDir="false" />
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : panel scrollable plus interface revue">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/packages/security.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/packages/security.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/app.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/app.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/layouts/default.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/layouts/default.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/pages/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Dto/AppVersion.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/ApiResource/AppVersion.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/State/AppVersionProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/State/AppVersionProvider.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/carrier/carrier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/carrier/carrier-list.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -225,43 +220,43 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <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;develop&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/sroy/Documents/test/Ferme&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;configurable.tailwindcss&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;
+  <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/312-creation-d-une-page-d-administration-listing-des-fournisseurs",
+    "last_opened_file_path": "/home/sroy/Documents/test/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": "configurable.tailwindcss",
+    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;postgresql&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "postgresql"
     ],
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
-      &quot;TEXT&quot;
+    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
+      "TEXT"
     ],
-    &quot;vue.recent.templates&quot;: [
-      &quot;Vue Composition API Component&quot;
+    "vue.recent.templates": [
+      "Vue Composition API Component"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\pages\admin\supplier" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches\Ferme_MCD\MCD_DOC" />
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\frontend\pages\reception" />
     </key>
   </component>
   <component name="SharedIndexes">
@@ -302,14 +297,6 @@
       <workItem from="1770195959162" duration="18915000" />
       <workItem from="1770274844804" duration="3940000" />
     </task>
-    <task id="LOCAL-00009" summary="feat : ajout d'une gestion d'erreur au global côté front avec la lib toaster et I18n pour centraliser les messages d'erreur">
-      <option name="closed" value="true" />
-      <created>1768555180530</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1768555180530</updated>
-    </task>
     <task id="LOCAL-00010" summary="feat : ajout de l'authentification avec lexik">
       <option name="closed" value="true" />
       <created>1768832208350</created>
@@ -694,7 +681,15 @@
       <option name="project" value="LOCAL" />
       <updated>1770371073055</updated>
     </task>
-    <option name="localTasksCounter" value="58" />
+    <task id="LOCAL-00058" summary="fix : nom page fournisseur">
+      <option name="closed" value="true" />
+      <created>1770632525875</created>
+      <option name="number" value="00058" />
+      <option name="presentableId" value="LOCAL-00058" />
+      <option name="project" value="LOCAL" />
+      <updated>1770632525875</updated>
+    </task>
+    <option name="localTasksCounter" value="59" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -744,7 +739,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="fix : gitea workflow" />
     <MESSAGE value="fix : script de déploiement" />
     <MESSAGE value="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil" />
     <MESSAGE value="fix : redirige sur le login sur une 401 et reset du auth state + doc + timeout du toaster" />
@@ -769,7 +763,8 @@
     <MESSAGE value="feat : update numéro de version" />
     <MESSAGE value="fix : auto-tag-develop.yml" />
     <MESSAGE value="feat : test auto-tag-develop.yml (auto incrément version)" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat : test auto-tag-develop.yml (auto incrément version)" />
+    <MESSAGE value="fix : nom page fournisseur" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix : nom page fournisseur" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
@@ -783,4 +778,4 @@
       <option value=".github/prompts" />
     </promptFileLocations>
   </component>
-</project>
+</project>

CHANGELOG.md

@@ -29,6 +29,9 @@ Ajouter dans le fichier .env du frontend
 * Finalisation de la partie réception de marchandise
 * [#267] Lister les réceptions en attente
 * [#268] Lister les réceptions terminées
+* [#316] Admin liste des transporteurs
+* [#312] Creation administration listing fournisseurs
+* [#317] Admin modification creation transporteur
 
 ### Changed
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.32'
+    app.version: '0.0.34'

frontend/i18n/locales/fr.json

@@ -46,7 +46,11 @@
             "list": "Impossible de récupérer la liste des races de bovins."
         },
         "carrier": {
-            "list": "Impossible de récupérer la liste des transporteurs."
+            "list": "Impossible de récupérer la liste des transporteurs.",
+            "fetch": "Impossible de récupérer les données du transporteur",
+            "update": "Impossible de mettre à jour le transporteur",
+            "create": "Impossible de créer le transporteur"
+
         },
         "driver": {
             "list": "Impossible de récupérer la liste des chauffeurs."
@@ -67,6 +71,10 @@
         "auth": {
             "login": "Connexion réussie.",
             "logout": "Déconnexion réussie."
+        },
+        "carrier": {
+            "update": "Transporteur mis à jour",
+            "create": "Transporteur créé"
         }
     }
 }

frontend/layouts/admin.vue

@@ -21,12 +21,18 @@
         </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 grid grid-rows-[auto,1fr,auto]">
-                <div class="p-4 font-semibold">Tableau de bord</div>
-
-                <div class="overflow-y-auto min-h-0 p-4 space-y-3">
+            <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">
+                        Tableau de bord
+                    </NuxtLink>
+                    <NuxtLink to="/admin/supplier/supplier-list">
+                        Fournisseur
+                    </NuxtLink>
+                    <NuxtLink to="/admin/carrier/carrier-list">
+                        Transporteur
+                    </NuxtLink>
                 </div>
 
                 <div class="p-4">

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

@@ -0,0 +1,101 @@
+
+<template>
+    <form @submit.prevent="validate">
+    <div class="flex items-center justify-between ">
+        <h1 class="text-3xl font-bold uppercase">
+            {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
+        </h1>
+
+        <button
+            type="submit"
+            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 mb-16">
+
+        <UiTextInput
+            label = "nom du fournisseur"
+            id="carrier-name"
+            v-model="form.name"
+        />
+
+        <UiTextInput
+                label = "code fournisseur"
+                id="code-id"
+                v-model="form.code"
+        />
+    </div>
+    </form>
+
+</template>
+
+<script setup lang="ts">
+import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
+import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
+const router = useRouter()
+const route = useRoute()
+const idCarrier = Number(route.params.id)
+const isLoading = ref(false)
+const isHydrating = ref(false)
+
+const form = reactive<CarrierFormData>({
+    code:'',
+    name:''
+})
+
+definePageMeta({
+    layout: 'admin'
+})
+
+const hydrateFromUser = (carrier: CarrierData | null) => {
+    if (!carrier) {
+        return
+    }
+    isHydrating.value = true
+    form.name = carrier.name ?? ''
+    form.code = carrier.code ?? ''
+    isHydrating.value = false
+}
+
+watch(
+    () => idCarrier,
+    async (id) => {
+        if (id === null) {
+            return
+        }
+        isLoading.value = true
+        try {
+            const user = await getCarrier(id)
+            hydrateFromUser(user)
+        } finally {
+            isLoading.value = false
+        }
+    },
+    {immediate: true}
+)
+async function validate() {
+
+    const normalizedCarrierCode = form.code.trim()
+    const normalizedCarrierName = form.name.trim()
+
+    const basePayload = {
+        name: normalizedCarrierName,
+        code: normalizedCarrierCode
+
+    }
+
+    if(idCarrier){
+        await updateCarrier(idCarrier, basePayload)
+        navigate()
+        return
+    }
+    await createCarrier(basePayload)
+    navigate()
+}
+
+function navigate(){
+    router.push("/admin/carrier/carrier-list")
+}
+</script>

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

@@ -0,0 +1,51 @@
+<template>
+
+    <div class="flex items-center justify-between ">
+            <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
+            <NuxtLink
+                to="/admin/carrier"
+                class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            >Ajouter
+            </NuxtLink>
+    </div>
+
+        <div class="mt-6 border border-slate-200 mb-16 ">
+            <div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+                <div>Label</div>
+                <div>Code</div>
+            </div>
+            <div
+                v-for="carrier in carrierList"
+                :key="carrier.id"
+                class="grid grid-cols-2 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                role="button"
+                tabindex="0"
+                @click="goToCarrier(carrier.id)"
+                @keydown.enter="goToCarrier(carrier.id)"
+            >
+                <div>{{ carrier.name}}</div>
+                <div>{{ carrier.code }}</div>
+            </div>
+        </div>
+
+</template>
+
+<script setup lang="ts">
+import type {CarrierData} from "~/services/dto/carrier-data";
+import {getCarrierList} from "~/services/carrier";
+
+const carrierList = ref<CarrierData[]>()
+const router = useRouter()
+
+const goToCarrier = (id: number) => {
+    router.push(`/admin/carrier/${id}`)
+}
+
+definePageMeta({
+    layout: 'admin'
+})
+
+onMounted(async () => {
+    carrierList.value = await getCarrierList(false)
+})
+</script>

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

@@ -0,0 +1,74 @@
+<template>
+    <div class="flex items-center justify-between">
+        <h1 class="text-3xl font-bold uppercase"> Fournisseurs </h1>
+        <NuxtLink to="/admin/supplier"
+                  class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+        >
+            Ajouter
+        </NuxtLink>
+    </div>
+    <div 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-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+            >
+                <div>Nom</div>
+                <div>Mail</div>
+                <div>Rue</div>
+                <div>Complément</div>
+                <div>Code Postal</div>
+                <div>Ville</div>
+            </div>
+
+            <div v-for="supplier in supplierList" :key="supplier.id">
+                <template v-if="supplier.addresses?.length">
+                    <div
+                        v-for="addr in supplier.addresses"
+                        :key="addr.id"
+                        class="grid grid-cols-6 hover:bg-slate-50 border-t gap-4 px-4 py-2"
+                        @click="goToSupplier(supplier.id)"
+                    >
+                        <div class="truncate">
+                            {{ supplier.name }}
+                        </div>
+                        <div class="truncate">
+                            {{ supplier.email }}
+                        </div>
+                        <div class="truncate">
+                            {{ addr.street }}
+                        </div>
+                        <div class="truncate">
+                            {{ addr.street2 }}
+                        </div>
+                        <div>{{ addr.postalCode }}</div>
+                        <div class="uppercase truncate">
+                            {{ addr.city }}
+                        </div>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import type {SupplierData} from "~/services/dto/supplier-data"
+import {getSupplierList} from "~/services/supplier"
+
+definePageMeta({layout: "admin"})
+
+const supplierList = ref<SupplierData[]>([])
+const router = useRouter()
+
+
+const goToSupplier = (id: number) => {
+    router.push(`/admin/supplier/${id}`)
+}
+
+onMounted(async () => {
+    supplierList.value = (await getSupplierList(false)) ?? []
+})
+
+</script>
+
+

frontend/services/carrier.ts

@@ -1,5 +1,5 @@
 import { useApi } from '~/composables/useApi'
-import type { CarrierData } from '~/services/dto/carrier-data'
+import type {CarrierData, CarrierPayload} from "~/services/dto/carrier-data";
 
 export type CarrierListResponse =
     | CarrierData[]
@@ -21,3 +21,26 @@ export async function getCarrierList(): Promise<CarrierData[]> {
 
     return []
 }
+
+export async function getCarrier(id: number) {
+    const api = useApi()
+    return api.get<CarrierData>(`carriers/${id}`, {}, {
+        toastErrorKey: 'errors.carrier.fetch'
+    })
+}
+
+export async function updateCarrier(id: number, payload: CarrierPayload) {
+    const api = useApi()
+    return api.patch<CarrierData>(`carriers/${id}`, payload, {
+        toastErrorKey: 'errors.carrier.update',
+        toastSuccessKey: 'success.carrier.update'
+    })
+}
+
+export async function createCarrier(payload: CarrierPayload = {}) {
+    const api = useApi()
+    return api.post<CarrierData>('carriers', payload, {
+        toastErrorKey: 'errors.carrier.create',
+        toastSuccessKey: 'success.carrier.update'
+    })
+}

frontend/services/dto/carrier-data.ts

@@ -3,3 +3,13 @@ export interface CarrierData {
     name: string
     code: string
 }
+
+export interface CarrierFormData {
+    name: string
+    code: string
+}
+
+export type CarrierPayload = {
+    name?: string | null
+    code?: string
+}

src/Entity/Carrier.php

@@ -7,6 +7,8 @@ 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;
 
@@ -21,6 +23,15 @@ use Symfony\Component\Serializer\Attribute\Groups;
         new GetCollection(
             normalizationContext: ['groups' => ['carrier:read']],
         ),
+        new Post(
+            normalizationContext: ['groups' => ['carrier:read']],
+            denormalizationContext: ['groups' => ['carrier:write']],
+        ),
+        new Patch(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['carrier:read']],
+            denormalizationContext: ['groups' => ['carrier:write']],
+        ),
     ],
     security: "is_granted('ROLE_USER')",
 )]
@@ -33,11 +44,11 @@ class Carrier
     private ?int $id = null;
 
     #[ORM\Column(length: 180)]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'carrier:write', 'driver:read', 'vehicle:read', 'reception:read'])]
     private string $name = '';
 
     #[ORM\Column(length: 30, nullable: true)]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'carrier:write', 'driver:read', 'vehicle:read', 'reception:read'])]
     private ?string $code = null;
 
     public function getId(): ?int