From 30f8ba5dc46004355d867051bdd374f64127b5a5 Mon Sep 17 00:00:00 2001
From: SamuelQuetin <samquetinuel@gmail.com>
Date: Fri, 6 Dec 2024 14:08:25 +0100
Subject: [PATCH 1/4] Ajout tooltip

---
 src/components/Supp/BtnStop.vue          | 24 +++++++++-------
 src/views/Exemplarisation/ExempTable.vue | 27 +++++++++++++-----
 src/views/Modification/ModifTable.vue    | 26 ++++++++++++++----
 src/views/Recouvrement/RecouvTable.vue   | 26 ++++++++++++++----
 src/views/Suppression/SuppTable.vue      | 35 +++++++++++++++++-------
 5 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/src/components/Supp/BtnStop.vue b/src/components/Supp/BtnStop.vue
index 6d866ff..9a8f0ce 100644
--- a/src/components/Supp/BtnStop.vue
+++ b/src/components/Supp/BtnStop.vue
@@ -1,24 +1,28 @@
 <template>
-  <v-btn icon="mdi-stop"  variant="plain" @click="click">
-  </v-btn>
+  <v-tooltip text="Annuler">
+    <template v-slot:activator="{ props }">
+      <v-btn v-bind="props" icon="mdi-stop" variant="plain" @click="click">
+      </v-btn>
+    </template>
+  </v-tooltip>
   <dialog-confirmation-stop v-model="dialog" :id="id" @stop="emits('stop')">
   </dialog-confirmation-stop>
 </template>
 <script setup>
-import DialogConfirmationStop from "@/components/Supp/DialogConfirmationStop.vue";
-import {ref} from "vue";
+import DialogConfirmationStop from '@/components/Supp/DialogConfirmationStop.vue';
+import { ref } from 'vue';
 
-const emits = defineEmits(['stop'])
+const emits = defineEmits(['stop']);
 const props = defineProps({
-  id:{
-    required:true,
-    type:Number
+  id: {
+    required: true,
+    type: Number
   }
-})
+});
 const dialog = ref(false);
 
 function click() {
-  dialog.value = true
+  dialog.value = true;
 }
 
 
diff --git a/src/views/Exemplarisation/ExempTable.vue b/src/views/Exemplarisation/ExempTable.vue
index a6b6324..b45396f 100644
--- a/src/views/Exemplarisation/ExempTable.vue
+++ b/src/views/Exemplarisation/ExempTable.vue
@@ -26,7 +26,8 @@
       </v-tooltip>
     </v-chip>
   </v-container>
-  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered" :items-length="totalItemsFound"
+  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered"
+                :items-length="totalItemsFound"
                 :loading="!isDataLoaded" show-expand :sort-by="sortBy"
                 item-key="id"
   >
@@ -119,9 +120,20 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <v-btn v-if="canArchive(item)" variant="plain" icon="mdi-archive" @click="archiverDemande(item)"></v-btn>
-          <v-btn v-else-if="canCancel(item)" variant="plain" icon="mdi-delete" @click="supprimerDemande(item)"></v-btn>
-
+          <v-tooltip v-if="canArchive(item)" text="Archiver">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
+                     @click="archiverDemande(item)"
+                     aria-label="Archiver"></v-btn>
+            </template>
+          </v-tooltip>
+          <v-tooltip v-else-if="canCancel(item)" text="Supprimer">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
+                     @click="supprimerDemande(item)"
+                     aria-label="Supprimer"></v-btn>
+            </template>
+          </v-tooltip>
         </td>
       </tr>
     </template>
@@ -138,12 +150,13 @@ import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import itemService from '@/service/ItemService';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment';
-import {useAuthStore} from '@/store/authStore'
+import { useAuthStore } from '@/store/authStore';
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
 
 //Data
-const isAdmin = useAuthStore().isAdmin();
+const isAdmin = useAuthStore()
+  .isAdmin();
 const extendedAllILN = ref(false);
 
 const headingsDemandes = [
@@ -249,7 +262,7 @@ const headingsDemandes = [
 ];
 const filteredHeadingsDemandes = computed(() =>
   headingsDemandes.filter(heading => heading.display !== false)
-)
+);
 
 const listStatut = [
   'En saisie',
diff --git a/src/views/Modification/ModifTable.vue b/src/views/Modification/ModifTable.vue
index 1273ae4..36dfff7 100644
--- a/src/views/Modification/ModifTable.vue
+++ b/src/views/Modification/ModifTable.vue
@@ -26,7 +26,8 @@
       </v-tooltip>
     </v-chip>
   </v-container>
-  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered" :items-length="totalItemsFound"
+  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered"
+                :items-length="totalItemsFound"
                 :loading="!isDataLoaded" show-expand :sort-by="sortBy"
                 item-key="id">
     <template v-slot:body.prepend>
@@ -118,8 +119,20 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <v-btn v-if="canArchive(item)" variant="plain" icon="mdi-archive" @click="archiverDemande(item)"></v-btn>
-          <v-btn v-else-if="canCancel(item)" variant="plain" icon="mdi-delete" @click="supprimerDemande(item)"></v-btn>
+          <v-tooltip v-if="canArchive(item)" text="Archiver">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
+                     @click="archiverDemande(item)"
+                     aria-label="Archiver"></v-btn>
+            </template>
+          </v-tooltip>
+          <v-tooltip v-else-if="canCancel(item)" text="Supprimer">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
+                     @click="supprimerDemande(item)"
+                     aria-label="Supprimer"></v-btn>
+            </template>
+          </v-tooltip>
         </td>
       </tr>
     </template>
@@ -136,13 +149,14 @@ import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment/moment';
-import {useAuthStore} from "@/store/authStore";
+import { useAuthStore } from '@/store/authStore';
 
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
 
 //Data
-const isAdmin = useAuthStore().isAdmin();
+const isAdmin = useAuthStore()
+  .isAdmin();
 const extendedAllILN = ref(false);
 const headingsDemandes = [
   {
@@ -247,7 +261,7 @@ const headingsDemandes = [
 ];
 const filteredHeadingsDemandes = computed(() =>
   headingsDemandes.filter(heading => heading.display !== false)
-)
+);
 
 const listStatut = [
   'En saisie',
diff --git a/src/views/Recouvrement/RecouvTable.vue b/src/views/Recouvrement/RecouvTable.vue
index fd6f33c..b90c472 100644
--- a/src/views/Recouvrement/RecouvTable.vue
+++ b/src/views/Recouvrement/RecouvTable.vue
@@ -25,7 +25,8 @@
       </v-tooltip>
     </v-chip>
   </v-container>
-  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered" :items-length="totalItemsFound"
+  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered"
+                :items-length="totalItemsFound"
                 :loading="!isDataLoaded" show-expand :sort-by="sortBy"
                 item-key="id">
     <template v-slot:body.prepend>
@@ -106,8 +107,20 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <v-btn v-if="canArchive(item)" variant="plain" icon="mdi-archive" @click="archiverDemande(item)"></v-btn>
-          <v-btn v-else-if="canCancel(item)" variant="plain" icon="mdi-delete" @click="supprimerDemande(item)"></v-btn>
+          <v-tooltip v-if="canArchive(item)" text="Archiver">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
+                     @click="archiverDemande(item)"
+                     aria-label="Archiver"></v-btn>
+            </template>
+          </v-tooltip>
+          <v-tooltip v-else-if="canCancel(item)" text="Supprimer">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
+                     @click="supprimerDemande(item)"
+                     aria-label="Supprimer"></v-btn>
+            </template>
+          </v-tooltip>
         </td>
       </tr>
     </template>
@@ -124,13 +137,14 @@ import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment/moment';
-import {useAuthStore} from "@/store/authStore";
+import { useAuthStore } from '@/store/authStore';
 
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
 
 //Data
-const isAdmin = useAuthStore().isAdmin();
+const isAdmin = useAuthStore()
+  .isAdmin();
 const extendedAllILN = ref(false);
 const headingsDemandes = [
   {
@@ -223,7 +237,7 @@ const headingsDemandes = [
 ];
 const filteredHeadingsDemandes = computed(() =>
   headingsDemandes.filter(heading => heading.display !== false)
-)
+);
 
 const listStatut = [
   'En saisie',
diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
index 4b5d3e0..a864471 100644
--- a/src/views/Suppression/SuppTable.vue
+++ b/src/views/Suppression/SuppTable.vue
@@ -27,7 +27,8 @@
       </v-tooltip>
     </v-chip>
   </v-container>
-  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered" :items-length="totalItemsFound"
+  <v-data-table :headers="filteredHeadingsDemandes" :items="contentsDemandesFrontFiltered"
+                :items-length="totalItemsFound"
                 :loading="!isDataLoaded" show-expand :sort-by="sortBy"
                 item-key="id">
     <template v-slot:body.prepend>
@@ -107,9 +108,22 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <btn-stop v-if="canStop(item)" :id="item.id" @stop="loadItems('SUPP', isArchiveDemandesDisplayed)"></btn-stop>
-          <v-btn v-if="canArchive(item)" variant="plain" icon="mdi-archive" @click="archiverDemande(item)"></v-btn>
-          <v-btn v-else-if="canCancel(item)" variant="plain" icon="mdi-delete" @click="supprimerDemande(item)"></v-btn>
+          <btn-stop v-if="canStop(item)" :id="item.id" @stop="loadItems('SUPP', isArchiveDemandesDisplayed)"
+                    aria-label="Annuler"></btn-stop>
+          <v-tooltip v-if="canArchive(item)" text="Archiver">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
+                     @click="archiverDemande(item)"
+                     aria-label="Archiver"></v-btn>
+            </template>
+          </v-tooltip>
+          <v-tooltip v-if="canCancel(item)" text="Supprimer">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
+                     @click="supprimerDemande(item)"
+                     aria-label="Supprimer"></v-btn>
+            </template>
+          </v-tooltip>
         </td>
       </tr>
     </template>
@@ -126,14 +140,15 @@ import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment/moment';
-import {useAuthStore} from "@/store/authStore";
-import BtnStop from "@/components/Supp/BtnStop.vue";
+import { useAuthStore } from '@/store/authStore';
+import BtnStop from '@/components/Supp/BtnStop.vue';
 
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
 
 //Data
-const isAdmin = useAuthStore().isAdmin();
+const isAdmin = useAuthStore()
+  .isAdmin();
 const extendedAllILN = ref(false);
 const headingsDemandes = [
   {
@@ -226,7 +241,7 @@ const headingsDemandes = [
 ];
 const filteredHeadingsDemandes = computed(() =>
   headingsDemandes.filter(heading => heading.display !== false)
-)
+);
 
 const listStatut = [
   'En saisie',
@@ -353,11 +368,11 @@ function canArchive(item) {
 }
 
 function canCancel(item) {
-  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente' && item.etatDemande !== 'Annulé';
+  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente';
 }
 
 function canStop(item) {
-  return item.etatDemande === 'En cours de traitement' || item.etatDemande === 'En attente'
+  return item.etatDemande === 'En cours de traitement' || item.etatDemande === 'En attente';
 }
 
 //Suppression d'une demande

From 4789398b8f1cd4d38fa392036488a5fd14f33c48 Mon Sep 17 00:00:00 2001
From: SamuelQuetin <samquetinuel@gmail.com>
Date: Mon, 9 Dec 2024 15:57:38 +0100
Subject: [PATCH 2/4] Refactor Sur les differents boutons d'actions

---
 src/components/ButtonsActions/BtnArchive.vue  | 36 ++++++++
 src/components/ButtonsActions/BtnRestore.vue  | 29 ++++++
 src/components/ButtonsActions/BtnStop.vue     | 30 +++++++
 .../ButtonsActions/BtnSuppression.vue         | 30 +++++++
 .../DialogConfirmationStop.vue                |  4 +-
 src/components/Dialog/DialogSuppression.vue   | 19 ++--
 src/components/Supp/BtnStop.vue               | 32 -------
 src/views/Exemplarisation/ExempTable.vue      | 64 ++-----------
 src/views/Modification/ModifTable.vue         | 73 ++-------------
 src/views/Recouvrement/RecouvTable.vue        | 67 ++------------
 src/views/Suppression/SuppTable.vue           | 89 +++----------------
 11 files changed, 176 insertions(+), 297 deletions(-)
 create mode 100644 src/components/ButtonsActions/BtnArchive.vue
 create mode 100644 src/components/ButtonsActions/BtnRestore.vue
 create mode 100644 src/components/ButtonsActions/BtnStop.vue
 create mode 100644 src/components/ButtonsActions/BtnSuppression.vue
 rename src/components/{Supp => Dialog}/DialogConfirmationStop.vue (91%)
 delete mode 100644 src/components/Supp/BtnStop.vue

diff --git a/src/components/ButtonsActions/BtnArchive.vue b/src/components/ButtonsActions/BtnArchive.vue
new file mode 100644
index 0000000..fdf3bdc
--- /dev/null
+++ b/src/components/ButtonsActions/BtnArchive.vue
@@ -0,0 +1,36 @@
+<template>
+  <v-tooltip v-if="canArchive(demande)" text="Archiver">
+    <template v-slot:activator="{ props }">
+      <v-btn v-bind="props" variant="plain" icon="mdi-archive"
+             @click="archiverDemande(demande)"
+             aria-label="Archiver"></v-btn>
+    </template>
+  </v-tooltip>
+</template>
+<script setup>
+import itemService from '@/service/ItemService';
+
+const emits = defineEmits(['clicked', 'onError']);
+const props = defineProps({
+  demande: {
+    required: true
+  }
+});
+
+//Action d'archivage ou suppression selon état de la demande dans le TDB
+function canArchive(item) {
+  return item.etatDemande === 'Terminé';
+}
+
+//Archivage d'une demande
+function archiverDemande(item) {
+  itemService.archiverDemande(item.type, item.id)
+      .then(() => {
+        emits('clicked');
+      })
+      .catch(error => {
+        emits('onError', error);
+      });
+}
+
+</script>
diff --git a/src/components/ButtonsActions/BtnRestore.vue b/src/components/ButtonsActions/BtnRestore.vue
new file mode 100644
index 0000000..425e8dc
--- /dev/null
+++ b/src/components/ButtonsActions/BtnRestore.vue
@@ -0,0 +1,29 @@
+<template>
+  <v-tooltip v-if="demande.etatDemande === 'Archivé'" text="Restaurer">
+    <template v-slot:activator="{ props }">
+      <v-btn v-bind="props" variant="plain" icon="mdi-package-up"
+             @click="restaurerDemande(demande)"></v-btn>
+    </template>
+  </v-tooltip>
+</template>
+<script setup>
+import itemService from '@/service/ItemService';
+
+const emits = defineEmits(['clicked', 'onError']);
+const props = defineProps({
+  demande: {
+    required: true
+  }
+});
+
+function restaurerDemande(item) {
+  itemService.restaurerDemande(item.id, item.type)
+    .then(() => {
+      emits('clicked');
+    })
+    .catch(error => {
+      emits('onError', error);
+    });
+}
+
+</script>
diff --git a/src/components/ButtonsActions/BtnStop.vue b/src/components/ButtonsActions/BtnStop.vue
new file mode 100644
index 0000000..155e6e7
--- /dev/null
+++ b/src/components/ButtonsActions/BtnStop.vue
@@ -0,0 +1,30 @@
+<template>
+  <v-tooltip v-if="canStop(demande)" text="Annuler">
+    <template v-slot:activator="{ props }">
+      <v-btn v-bind="props" icon="mdi-stop" variant="plain" @click="dialog.value = true;">
+      </v-btn>
+    </template>
+  </v-tooltip>
+  <dialog-confirmation-stop v-model="dialog" :id="demande.id" @clicked="emits('clicked')" @on-error="throwError">
+  </dialog-confirmation-stop>
+</template>
+<script setup>
+import DialogConfirmationStop from '@/components/Dialog/DialogConfirmationStop.vue';
+import { ref } from 'vue';
+
+const emits = defineEmits(['clicked', 'onError']);
+const props = defineProps({
+  demande: {
+    required: true
+  }
+});
+const dialog = ref(false);
+
+function canStop(item) {
+  return item.etatDemande === 'En cours de traitement' || item.etatDemande === 'En attente';
+}
+
+function throwError(error) {
+  emits('onError', error);
+}
+</script>
diff --git a/src/components/ButtonsActions/BtnSuppression.vue b/src/components/ButtonsActions/BtnSuppression.vue
new file mode 100644
index 0000000..222e416
--- /dev/null
+++ b/src/components/ButtonsActions/BtnSuppression.vue
@@ -0,0 +1,30 @@
+<template>
+  <v-tooltip v-if="canCancel(demande)" text="Supprimer">
+    <template v-slot:activator="{ props }">
+      <v-btn v-bind="props" icon="mdi-delete" variant="plain" @click="dialog = true;">
+      </v-btn>
+    </template>
+  </v-tooltip>
+  <dialog-suppression v-model="dialog" :demande="demande" @supp="emits('clicked')" @on-error="throwError">
+  </dialog-suppression>
+</template>
+<script setup>
+import { ref } from 'vue';
+import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
+
+const emits = defineEmits(['clicked', 'onError']);
+const props = defineProps({
+  demande: {
+    required: true,
+  }
+});
+const dialog = ref(false);
+
+function canCancel(item) {
+  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente';
+}
+
+function throwError(error) {
+  emits('onError', error);
+}
+</script>
diff --git a/src/components/Supp/DialogConfirmationStop.vue b/src/components/Dialog/DialogConfirmationStop.vue
similarity index 91%
rename from src/components/Supp/DialogConfirmationStop.vue
rename to src/components/Dialog/DialogConfirmationStop.vue
index 08c8e1a..2388fd1 100644
--- a/src/components/Supp/DialogConfirmationStop.vue
+++ b/src/components/Dialog/DialogConfirmationStop.vue
@@ -15,7 +15,7 @@
 <script setup>
 import itemService from '@/service/ItemService';
 
-const emits = defineEmits(['stop', 'onError']);
+const emits = defineEmits(['clicked', 'onError']);
 const dialog = defineModel();
 const props = defineProps({
   id: {
@@ -31,7 +31,7 @@ function stopDemande() {
     })
     .finally(() => {
       dialog.value = false;
-      emits('stop');
+      emits('clicked');
     });
 }
 </script>
diff --git a/src/components/Dialog/DialogSuppression.vue b/src/components/Dialog/DialogSuppression.vue
index 1cea8d1..38bb579 100644
--- a/src/components/Dialog/DialogSuppression.vue
+++ b/src/components/Dialog/DialogSuppression.vue
@@ -10,7 +10,7 @@
       <v-card>
         <v-card-title>Suppression</v-card-title>
         <v-divider></v-divider>
-        <v-card-text>Êtes-vous certain de vouloir supprimer définitivement cette demande ?</v-card-text>
+        <v-card-text>Êtes-vous certain de vouloir supprimer définitivement la demande N°{{ demande.id }} ?</v-card-text>
         <v-card-actions>
 
           <v-container class="d-flex justify-space-between">
@@ -28,7 +28,7 @@ import router from '@/router';
 import { ref } from 'vue';
 
 const dialog = defineModel();
-const emits = defineEmits(['supp'])
+const emits = defineEmits(['supp']);
 const props = defineProps({
   returnToAccueil: {
     required: false,
@@ -38,21 +38,22 @@ const props = defineProps({
     required: true,
     type: Object
   }
-})
+});
 const isLoading = ref(false);
 
 function confirm() {
   isLoading.value = true;
   itemService.deleteDemande(props.demande.id, props.demande.type)
-    .then(()=>{
-      if(props.returnToAccueil){
+    .then(() => {
+      if (props.returnToAccueil) {
         router.push('/accueil');
       }
       emits('supp');
-    }).finally(() => {
-    isLoading.value = false;
-    dialog.value = false;
-  })
+    })
+    .finally(() => {
+      isLoading.value = false;
+      dialog.value = false;
+    });
 }
 
 function cancel() {
diff --git a/src/components/Supp/BtnStop.vue b/src/components/Supp/BtnStop.vue
deleted file mode 100644
index 76888c5..0000000
--- a/src/components/Supp/BtnStop.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <v-tooltip text="Annuler">
-    <template v-slot:activator="{ props }">
-      <v-btn v-bind="props" icon="mdi-stop" variant="plain" @click="click">
-      </v-btn>
-    </template>
-  </v-tooltip>
-  <dialog-confirmation-stop v-model="dialog" :id="id" @stop="emits('stop')" @on-error="throwError">
-  </dialog-confirmation-stop>
-</template>
-<script setup>
-import DialogConfirmationStop from '@/components/Supp/DialogConfirmationStop.vue';
-import { ref } from 'vue';
-
-const emits = defineEmits(['stop', 'onError']);
-const props = defineProps({
-  id: {
-    required: true,
-    type: Number
-  }
-});
-const dialog = ref(false);
-
-function click() {
-  dialog.value = true;
-}
-
-function throwError(err) {
-  emits('onError', err);
-}
-
-</script>
diff --git a/src/views/Exemplarisation/ExempTable.vue b/src/views/Exemplarisation/ExempTable.vue
index da1ce6c..b015d74 100644
--- a/src/views/Exemplarisation/ExempTable.vue
+++ b/src/views/Exemplarisation/ExempTable.vue
@@ -120,38 +120,29 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <v-tooltip v-if="canArchive(item)" text="Archiver">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
-                     @click="archiverDemande(item)"
-                     aria-label="Archiver"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-tooltip v-else-if="canCancel(item)" text="Supprimer">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
-                     @click="supprimerDemande(item)"
-                     aria-label="Supprimer"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
+          <btn-archive :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Archiver"></btn-archive>
+          <btn-suppression :demande="item" @clicked="loadItems(item.type)"
+                           @on-error="throwError" aria-label="Supprimer"></btn-suppression>
+          <btn-restore :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Restaurer"></btn-restore>
         </td>
       </tr>
     </template>
   </v-data-table>
-  <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('EXEMP')"></dialog-suppression>
 </template>
 
 <script setup>
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
 import router from '@/router';
-import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import itemService from '@/service/ItemService';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment';
 import { useAuthStore } from '@/store/authStore';
+import BtnSuppression from '@/components/ButtonsActions/BtnSuppression.vue';
+import BtnArchive from '@/components/ButtonsActions/BtnArchive.vue';
+import BtnRestore from '@/components/ButtonsActions/BtnRestore.vue';
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
 
@@ -373,43 +364,6 @@ function filterItems() {
   });
 }
 
-//Action d'archivage ou suppression selon état de la demande dans le TDB
-function canArchive(item) {
-  return item.etatDemande === 'Terminé';
-}
-
-function canCancel(item) {
-  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente';
-}
-
-//Suppression d'une demande
-function supprimerDemande(item) {
-  suppDialog.value = true;
-  suppDemande.value = item;
-}
-
-function restaurerDemande(item) {
-  itemService.restaurerDemande(item.id, "EXEMP").then(() => {
-    loadItems('EXEMP');
-  }).catch(error => {
-    console.error(error);
-    emit('backendError', error);
-  });
-}
-
-//Archivage d'une demande
-async function archiverDemande(item) {
-  try {
-    await itemService.archiverDemande('EXEMP', item.id);
-    // Mettre à jour les données après l'archivage réussi
-    await loadItems('EXEMP');
-    emit('backendSuccess');
-  } catch (error) {
-    console.error(error);
-    emit('backendError', error);
-  }
-}
-
 function onRowClick(item) {
   if (item.etatDemande === 'En préparation' || item.etatDemande === 'A compléter' || item.etatDemande === 'En simulation') {
     router.push('/exemplarisation/' + item.id);
diff --git a/src/views/Modification/ModifTable.vue b/src/views/Modification/ModifTable.vue
index efeefea..58f2d13 100644
--- a/src/views/Modification/ModifTable.vue
+++ b/src/views/Modification/ModifTable.vue
@@ -118,38 +118,29 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <v-tooltip v-if="canArchive(item)" text="Archiver">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
-                     @click="archiverDemande(item)"
-                     aria-label="Archiver"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-tooltip v-else-if="canCancel(item)" text="Supprimer">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
-                     @click="supprimerDemande(item)"
-                     aria-label="Supprimer"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
+          <btn-archive :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Archiver"></btn-archive>
+          <btn-suppression :demande="item" @clicked="loadItems(item.type)"
+                           @on-error="throwError" aria-label="Supprimer"></btn-suppression>
+          <btn-restore :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Restaurer"></btn-restore>
         </td>
       </tr>
     </template>
   </v-data-table>
-  <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('MODIF')"></dialog-suppression>
 </template>
 
 <script setup>
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
 import router from '@/router';
 import itemService from '@/service/ItemService';
-import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment/moment';
 import { useAuthStore } from '@/store/authStore';
+import BtnRestore from '@/components/ButtonsActions/BtnRestore.vue';
+import BtnSuppression from '@/components/ButtonsActions/BtnSuppression.vue';
+import BtnArchive from '@/components/ButtonsActions/BtnArchive.vue';
 
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
@@ -373,52 +364,6 @@ function filterItems() {
   });
 }
 
-function isAvailableFile(demandeNumber, filename) {
-  return itemService.headFile(filename, demandeNumber, 'csv', 'MODIF')
-    .then((response) => response.status !== 500)
-    .catch((error) => {
-      console.error(error);
-      return false;
-    });
-}
-
-//Action d'archivage ou suppression selon état de la demande dans le TDB
-function canArchive(item) {
-  return item.etatDemande === 'Terminé';
-}
-
-function canCancel(item) {
-  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente';
-}
-
-//Suppression d'une demande
-function supprimerDemande(item) {
-  suppDialog.value = true;
-  suppDemande.value = item;
-}
-
-function restaurerDemande(item) {
-  itemService.restaurerDemande(item.id, "MODIF").then(() => {
-    loadItems('MODIF');
-  }).catch(error => {
-    console.error(error);
-    emit('backendError', error);
-  });
-}
-
-//Archivage d'une demande
-async function archiverDemande(item) {
-  try {
-    await itemService.archiverDemande('MODIF', item.id);
-    // Mettre à jour les données après l'archivage réussi
-    await loadItems('MODIF');
-    emit('backendSuccess');
-  } catch (error) {
-    console.error(error);
-    emit('backendError', error);
-  }
-}
-
 function onRowClick(item) {
   if (item.etatDemande === 'En préparation' || item.etatDemande === 'Préparée' || item.etatDemande === 'A compléter' || item.etatDemande === 'En simulation') {
     router.push('/modification/' + item.id);
diff --git a/src/views/Recouvrement/RecouvTable.vue b/src/views/Recouvrement/RecouvTable.vue
index b899cbc..aa215a7 100644
--- a/src/views/Recouvrement/RecouvTable.vue
+++ b/src/views/Recouvrement/RecouvTable.vue
@@ -107,38 +107,29 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <v-tooltip v-if="canArchive(item)" text="Archiver">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
-                     @click="archiverDemande(item)"
-                     aria-label="Archiver"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-tooltip v-else-if="canCancel(item)" text="Supprimer">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
-                     @click="supprimerDemande(item)"
-                     aria-label="Supprimer"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
+          <btn-archive :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Archiver"></btn-archive>
+          <btn-suppression :demande="item" @clicked="loadItems(item.type)"
+                           @on-error="throwError" aria-label="Supprimer"></btn-suppression>
+          <btn-restore :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Restaurer"></btn-restore>
         </td>
       </tr>
     </template>
   </v-data-table>
-  <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('RECOUV')"></dialog-suppression>
 </template>
 
 <script setup>
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
 import itemService from '@/service/ItemService';
 import router from '@/router';
-import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment/moment';
 import { useAuthStore } from '@/store/authStore';
+import BtnSuppression from '@/components/ButtonsActions/BtnSuppression.vue';
+import BtnRestore from '@/components/ButtonsActions/BtnRestore.vue';
+import BtnArchive from '@/components/ButtonsActions/BtnArchive.vue';
 
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
@@ -337,52 +328,12 @@ function filterItems() {
   });
 }
 
-//Action d'archivage ou suppression selon état de la demande dans le TDB
-function canArchive(item) {
-  return item.etatDemande === 'Terminé';
-}
-
-function canCancel(item) {
-  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente';
-}
-
-//Suppression d'une demande
-function supprimerDemande(item) {
-  suppDialog.value = true;
-  suppDemande.value = item;
-}
-
-function restaurerDemande(item) {
-  itemService.restaurerDemande(item.id, "RECOUV").then(() => {
-    loadItems('RECOUV')
-  }).catch(error => {
-    console.error(error);
-    emit('backendError', error);
-  });
-}
-
-//Archivage d'une demande
-async function archiverDemande(item) {
-  try {
-    await itemService.archiverDemande('RECOUV', item.id);
-    // Mettre à jour les données après l'archivage réussi
-    await loadItems('RECOUV');
-    emit('backendSuccess');
-  } catch (error) {
-    console.error(error);
-    emit('backendError', error);
-  }
-}
-
 function onRowClick(item) {
   if (item.etatDemande === 'En préparation') {
     router.push('/recouvrement/' + item.id);
   }
 }
 
-function saveAction() {
-}
-
 function saveComment() {
   loadItems('RECOUV')
     .then(() => {
diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
index 2467714..e1b2471 100644
--- a/src/views/Suppression/SuppTable.vue
+++ b/src/views/Suppression/SuppTable.vue
@@ -108,44 +108,32 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <btn-stop v-if="canStop(item)" :id="item.id" @stop="loadItems('SUPP', isArchiveDemandesDisplayed)"
+          <btn-stop :demande="item" @clicked="loadItems(item.type)"
                     @on-error="throwError" aria-label="Annuler"></btn-stop>
-          <v-tooltip v-if="canArchive(item)" text="Archiver">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-archive"
-                     @click="archiverDemande(item)"
-                     aria-label="Archiver"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-tooltip v-if="canCancel(item)" text="Supprimer">
-            <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" variant="plain" icon="mdi-delete"
-                     @click="supprimerDemande(item)"
-                     aria-label="Supprimer"></v-btn>
-            </template>
-          </v-tooltip>
-          <v-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
+          <btn-archive :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Archiver"></btn-archive>
+          <btn-suppression :demande="item" @clicked="loadItems(item.type)"
+                           @on-error="throwError" aria-label="Supprimer"></btn-suppression>
+          <btn-restore :demande="item" @clicked="loadItems(item.type)"
+                       @on-error="throwError" aria-label="Restaurer"></btn-restore>
         </td>
       </tr>
     </template>
   </v-data-table>
-  <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('SUPP', isArchiveDemandesDisplayed)"></dialog-suppression>
 </template>
 
 <script setup>
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
 import router from '@/router';
 import demandesService from '@/service/ItemService';
-import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
 import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment/moment';
+import BtnStop from '@/components/ButtonsActions/BtnStop.vue';
 import { useAuthStore } from '@/store/authStore';
-import BtnStop from '@/components/Supp/BtnStop.vue';
-import itemService from "@/service/ItemService";
-import { useAuthStore } from '@/store/authStore';
-import BtnStop from '@/components/Supp/BtnStop.vue';
+import BtnArchive from '@/components/ButtonsActions/BtnArchive.vue';
+import BtnSuppression from '@/components/ButtonsActions/BtnSuppression.vue';
+import BtnRestore from '@/components/ButtonsActions/BtnRestore.vue';
 
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
@@ -154,6 +142,7 @@ const emit = defineEmits(['backendError', 'backendSuccess']);
 const isAdmin = useAuthStore()
   .isAdmin();
 const extendedAllILN = ref(false);
+const type = 'SUPP';
 const headingsDemandes = [
   {
     title: '',
@@ -259,8 +248,6 @@ const listTypeTraitement = ref([]);
 const contentsDemandesFromServer = ref([]);
 const contentsDemandesFrontFiltered = ref([]);
 const totalItemsFound = ref(0);
-const suppDialog = ref(false);
-const suppDemande = ref({});
 const sortBy = ref([{
   key: 'dateModification',
   order: 'desc'
@@ -330,7 +317,6 @@ async function loadItems(type) {
     isDataLoaded.value = true;
     emit('backendSuccess');
   } catch (error) {
-    console.error(error);
     emit('backendError', error);
   }
 }
@@ -357,56 +343,6 @@ function filterItems() {
   });
 }
 
-function isAvailableFile(demandeNumber, filename) {
-  return demandesService.headFile(filename, demandeNumber, 'csv', 'SUPP')
-    .then((response) => response.status !== 500)
-    .catch((error) => {
-      console.error(error);
-      return false;
-    });
-}
-
-//Action d'archivage ou suppression selon état de la demande dans le TDB
-function canArchive(item) {
-  return item.etatDemande === 'Terminé' || item.etatDemande === 'Annulé';
-}
-
-function canCancel(item) {
-  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente';
-}
-
-function canStop(item) {
-  return item.etatDemande === 'En cours de traitement' || item.etatDemande === 'En attente';
-}
-
-//Suppression d'une demande
-function supprimerDemande(item) {
-  suppDialog.value = true;
-  suppDemande.value = item;
-}
-
-function restaurerDemande(item) {
-  itemService.restaurerDemande(item.id, "SUPP").then(() => {
-    loadItems('SUPP');
-  }).catch(error => {
-    console.error(error);
-    emit('backendError', error);
-  });
-}
-
-//Archivage d'une demande
-async function archiverDemande(item) {
-  try {
-    await demandesService.archiverDemande('SUPP', item.id);
-    // Mettre à jour les données après l'archivage réussi
-    await loadItems('SUPP');
-    emit('backendSuccess');
-  } catch (error) {
-    console.error(error);
-    emit('backendError', error);
-  }
-}
-
 function onRowClick(item) {
   if (item.etatDemande === 'En préparation' || item.etatDemande === 'Préparée' || item.etatDemande === 'A compléter' || item.etatDemande === 'En simulation') {
     router.push('/suppression/' + item.id);
@@ -434,7 +370,6 @@ function colorProgressBar(item) {
   }
   return 'grey-lighten-1';
 }
-
 </script>
 
 <style scoped>

From 9bcfc5fca038361abab263c447308cff347695ad Mon Sep 17 00:00:00 2001
From: SamuelQuetin <samquetinuel@gmail.com>
Date: Mon, 9 Dec 2024 16:08:36 +0100
Subject: [PATCH 3/4] Ajout couleur comme US

---
 src/components/ButtonsActions/BtnArchive.vue     | 5 ++++-
 src/components/ButtonsActions/BtnRestore.vue     | 5 ++++-
 src/components/ButtonsActions/BtnStop.vue        | 6 +++++-
 src/components/ButtonsActions/BtnSuppression.vue | 5 ++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/ButtonsActions/BtnArchive.vue b/src/components/ButtonsActions/BtnArchive.vue
index fdf3bdc..7a63c00 100644
--- a/src/components/ButtonsActions/BtnArchive.vue
+++ b/src/components/ButtonsActions/BtnArchive.vue
@@ -1,7 +1,10 @@
 <template>
   <v-tooltip v-if="canArchive(demande)" text="Archiver">
     <template v-slot:activator="{ props }">
-      <v-btn v-bind="props" variant="plain" icon="mdi-archive"
+      <v-btn v-bind="props"
+             variant="text"
+             icon="mdi-archive"
+             color="archived"
              @click="archiverDemande(demande)"
              aria-label="Archiver"></v-btn>
     </template>
diff --git a/src/components/ButtonsActions/BtnRestore.vue b/src/components/ButtonsActions/BtnRestore.vue
index 425e8dc..6832814 100644
--- a/src/components/ButtonsActions/BtnRestore.vue
+++ b/src/components/ButtonsActions/BtnRestore.vue
@@ -1,7 +1,10 @@
 <template>
   <v-tooltip v-if="demande.etatDemande === 'Archivé'" text="Restaurer">
     <template v-slot:activator="{ props }">
-      <v-btn v-bind="props" variant="plain" icon="mdi-package-up"
+      <v-btn v-bind="props"
+             variant="text"
+             color="success"
+             icon="mdi-package-up"
              @click="restaurerDemande(demande)"></v-btn>
     </template>
   </v-tooltip>
diff --git a/src/components/ButtonsActions/BtnStop.vue b/src/components/ButtonsActions/BtnStop.vue
index 155e6e7..68714fc 100644
--- a/src/components/ButtonsActions/BtnStop.vue
+++ b/src/components/ButtonsActions/BtnStop.vue
@@ -1,7 +1,11 @@
 <template>
   <v-tooltip v-if="canStop(demande)" text="Annuler">
     <template v-slot:activator="{ props }">
-      <v-btn v-bind="props" icon="mdi-stop" variant="plain" @click="dialog.value = true;">
+      <v-btn v-bind="props"
+             icon="mdi-stop"
+             variant="text"
+             color="error"
+             @click="dialog = true">
       </v-btn>
     </template>
   </v-tooltip>
diff --git a/src/components/ButtonsActions/BtnSuppression.vue b/src/components/ButtonsActions/BtnSuppression.vue
index 222e416..4082304 100644
--- a/src/components/ButtonsActions/BtnSuppression.vue
+++ b/src/components/ButtonsActions/BtnSuppression.vue
@@ -1,7 +1,10 @@
 <template>
   <v-tooltip v-if="canCancel(demande)" text="Supprimer">
     <template v-slot:activator="{ props }">
-      <v-btn v-bind="props" icon="mdi-delete" variant="plain" @click="dialog = true;">
+      <v-btn v-bind="props"
+             icon="mdi-delete"
+             variant="text"
+             @click="dialog = true">
       </v-btn>
     </template>
   </v-tooltip>

From 34ac49fc2718d59cde13e77ad58f14769d7daaa4 Mon Sep 17 00:00:00 2001
From: SamuelQuetin <samquetinuel@gmail.com>
Date: Wed, 11 Dec 2024 15:41:03 +0100
Subject: [PATCH 4/4] Fix couleur

---
 src/components/ButtonsActions/BtnArchive.vue | 14 +++++++-------
 src/components/ButtonsActions/BtnRestore.vue |  2 +-
 src/components/ButtonsActions/BtnStop.vue    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/ButtonsActions/BtnArchive.vue b/src/components/ButtonsActions/BtnArchive.vue
index 7a63c00..5c36570 100644
--- a/src/components/ButtonsActions/BtnArchive.vue
+++ b/src/components/ButtonsActions/BtnArchive.vue
@@ -4,7 +4,7 @@
       <v-btn v-bind="props"
              variant="text"
              icon="mdi-archive"
-             color="archived"
+             color="primary"
              @click="archiverDemande(demande)"
              aria-label="Archiver"></v-btn>
     </template>
@@ -28,12 +28,12 @@ function canArchive(item) {
 //Archivage d'une demande
 function archiverDemande(item) {
   itemService.archiverDemande(item.type, item.id)
-      .then(() => {
-        emits('clicked');
-      })
-      .catch(error => {
-        emits('onError', error);
-      });
+    .then(() => {
+      emits('clicked');
+    })
+    .catch(error => {
+      emits('onError', error);
+    });
 }
 
 </script>
diff --git a/src/components/ButtonsActions/BtnRestore.vue b/src/components/ButtonsActions/BtnRestore.vue
index 6832814..5a33779 100644
--- a/src/components/ButtonsActions/BtnRestore.vue
+++ b/src/components/ButtonsActions/BtnRestore.vue
@@ -3,7 +3,7 @@
     <template v-slot:activator="{ props }">
       <v-btn v-bind="props"
              variant="text"
-             color="success"
+             color="green"
              icon="mdi-package-up"
              @click="restaurerDemande(demande)"></v-btn>
     </template>
diff --git a/src/components/ButtonsActions/BtnStop.vue b/src/components/ButtonsActions/BtnStop.vue
index 68714fc..4b7623d 100644
--- a/src/components/ButtonsActions/BtnStop.vue
+++ b/src/components/ButtonsActions/BtnStop.vue
@@ -4,7 +4,7 @@
       <v-btn v-bind="props"
              icon="mdi-stop"
              variant="text"
-             color="error"
+             color="red"
              @click="dialog = true">
       </v-btn>
     </template>