From 34c1d162d8a0fbb45f3166ab806e2e1869b76cae Mon Sep 17 00:00:00 2001
From: tristan <tristan@yuno.malio.fr>
Date: Mon, 30 Mar 2026 13:47:46 +0000
Subject: [PATCH] =?UTF-8?q?[#FER-15]=20Fix=20droit=20de=20suppression=20r?=
 =?UTF-8?q?=C3=A9ception/exp=C3=A9dition=20utilisateur=20(!43)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

| Numéro du ticket | Titre du ticket |
|------------------|-----------------|
|                  |                 |

## Description de la PR

## Modification du .env

## Check list

- [x] Pas de régression
- [x] TU/TI/TF rédigée
- [x] TU/TI/TF OK
- [ ] CHANGELOG modifié

Reviewed-on: https://gitea.malio.fr/MALIO-DEV/Ferme/pulls/43
Co-authored-by: tristan <tristan@yuno.malio.fr>
Co-committed-by: tristan <tristan@yuno.malio.fr>
---
 .idea/workspace.xml                           | 38 +++++++++++--------
 CHANGELOG.md                                  |  1 +
 .../pages/reception/waiting-reception.vue     |  5 ++-
 frontend/pages/shipment/waiting-shipment.vue  |  5 ++-
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fcaf55f..3afb783 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : update CHANGELOG.md" />
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : les non-admin ne peuvent plus supprimer de réception/expédition en attente">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" 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/reception/waiting-reception.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/waiting-reception.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/shipment/waiting-shipment.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/shipment/waiting-shipment.vue" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -35,7 +41,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="feature/FER-12-ajouter-un-blocage-des-utilisateurs" />
+        <entry key="$PROJECT_DIR$" value="feature/FER-13-faire-des-recherches-sur-le-scanner-des-betes" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -226,7 +232,7 @@
     "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
     "RunOnceActivity.git.unshallow": "true",
     "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "git-widget-placeholder": "feature/FER-13-faire-des-recherches-sur-le-scanner-des-betes",
+    "git-widget-placeholder": "fix/FER-15-fix-droit-de-suppression-reception-expedition-util",
     "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",
@@ -320,15 +326,7 @@
       <workItem from="1773766075191" duration="6202000" />
       <workItem from="1773824491213" duration="24805000" />
       <workItem from="1774275549972" duration="51000" />
-      <workItem from="1774276665015" duration="28381000" />
-    </task>
-    <task id="LOCAL-00036" summary="feat : update du CHANGELOG.md">
-      <option name="closed" value="true" />
-      <created>1769435038236</created>
-      <option name="number" value="00036" />
-      <option name="presentableId" value="LOCAL-00036" />
-      <option name="project" value="LOCAL" />
-      <updated>1769435038236</updated>
+      <workItem from="1774276665015" duration="33750000" />
     </task>
     <task id="LOCAL-00037" summary="feat : finalisation de l'étape 1 &quot;Réception&quot; (formulaire)">
       <option name="closed" value="true" />
@@ -714,7 +712,15 @@
       <option name="project" value="LOCAL" />
       <updated>1774543766582</updated>
     </task>
-    <option name="localTasksCounter" value="85" />
+    <task id="LOCAL-00085" summary="feat : la page de scanner est accessible que pour les admins">
+      <option name="closed" value="true" />
+      <created>1774543840891</created>
+      <option name="number" value="00085" />
+      <option name="presentableId" value="LOCAL-00085" />
+      <option name="project" value="LOCAL" />
+      <updated>1774543840891</updated>
+    </task>
+    <option name="localTasksCounter" value="86" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -764,8 +770,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="feat : affichage et modification expédition et modification bouton valider" />
-    <MESSAGE value="fix : erreur customer adress et bouton valider oublie" />
     <MESSAGE value="feat : changelog update" />
     <MESSAGE value="fix : color tab" />
     <MESSAGE value="feat : modification front de la page admin transporteur" />
@@ -789,7 +793,9 @@
     <MESSAGE value="feat : ajout d'un système de scanner bovin" />
     <MESSAGE value="feat : mise à jour du CLAUDE.md" />
     <MESSAGE value="feat : update CHANGELOG.md" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat : update CHANGELOG.md" />
+    <MESSAGE value="feat : la page de scanner est accessible que pour les admins" />
+    <MESSAGE value="fix : les non-admin ne peuvent plus supprimer de réception/expédition en attente" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix : les non-admin ne peuvent plus supprimer de réception/expédition en attente" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd79251..c48f6e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@ Ajouter dans le fichier .env du frontend
 * [#FER-11] Corriger le problème de bearer token
 * [#FER-12] Ajouter un blocage des utilisateurs
 * [#FER-13] Faire des recherches sur le scanner des bêtes
+* [#FER-15] Les non-admin ne peuvent plus supprimer de réception/expédition en attente
 
 ### Changed
 
diff --git a/frontend/pages/reception/waiting-reception.vue b/frontend/pages/reception/waiting-reception.vue
index 11125bc..10d7797 100644
--- a/frontend/pages/reception/waiting-reception.vue
+++ b/frontend/pages/reception/waiting-reception.vue
@@ -4,7 +4,7 @@
         :columns="columns"
         :items="receptionList ?? []"
         route-prefix="/reception"
-        show-actions
+        :show-actions="auth.isAdmin"
     >
         <template #cell-receptionDate="{ item }">
             {{ formatDate(item.receptionDate) }}
@@ -23,6 +23,9 @@
 <script setup lang="ts">
 import type { ReceptionData } from '~/services/dto/reception-data'
 import { getReceptionList, deleteReception } from '~/services/reception'
+import { useAuthStore } from '~/stores/auth'
+
+const auth = useAuthStore()
 
 const columns = [
     { key: 'receptionDate', label: 'Date et heure' },
diff --git a/frontend/pages/shipment/waiting-shipment.vue b/frontend/pages/shipment/waiting-shipment.vue
index d6770c3..87922e8 100644
--- a/frontend/pages/shipment/waiting-shipment.vue
+++ b/frontend/pages/shipment/waiting-shipment.vue
@@ -4,7 +4,7 @@
         :columns="columns"
         :items="shipmentList ?? []"
         route-prefix="/shipment"
-        show-actions
+        :show-actions="auth.isAdmin"
     >
         <template #cell-shipmentDate="{ item }">
             {{ formatDate(item.shipmentDate) }}
@@ -35,6 +35,9 @@
 <script setup lang="ts">
 import type { ShipmentData } from '~/services/dto/shipment-data'
 import { getShipmentList, deleteShipment } from '~/services/shipment'
+import { useAuthStore } from '~/stores/auth'
+
+const auth = useAuthStore()
 
 const columns = [
     { key: 'shipmentDate', label: 'Date et heure' },