From 056372f85ad68de7741dc5e0e56014710fa3df90 Mon Sep 17 00:00:00 2001
From: SamuelQuetin <quetin@abes.fr>
Date: Thu, 5 Dec 2024 16:11:15 +0100
Subject: [PATCH 1/4] ITEM-386 Ajouter action "Restaurer"

---
 src/service/ItemService.js               |  4 +++
 src/views/Exemplarisation/ExempTable.vue | 39 +++++++++++++---------
 src/views/Modification/ModifTable.vue    | 39 +++++++++++++---------
 src/views/Recouvrement/RecouvTable.vue   | 42 +++++++++++++++---------
 src/views/Suppression/SuppTable.vue      | 25 ++++++++++----
 5 files changed, 96 insertions(+), 53 deletions(-)

diff --git a/src/service/ItemService.js b/src/service/ItemService.js
index 4635ebd..ebf75cc 100644
--- a/src/service/ItemService.js
+++ b/src/service/ItemService.js
@@ -170,6 +170,10 @@ export class ItemService {
   stopDemande(id) {
     return this.client.patch('stopDemandeSupp/' + id);
   }
+
+  restaurerDemande(id, typeDemande) {
+    return this.client.patch('restaurerDemande/' + typeDemande + '/' + id )
+  }
 }
 
 export default new ItemService()
diff --git a/src/views/Exemplarisation/ExempTable.vue b/src/views/Exemplarisation/ExempTable.vue
index a6b6324..c998d49 100644
--- a/src/views/Exemplarisation/ExempTable.vue
+++ b/src/views/Exemplarisation/ExempTable.vue
@@ -1,18 +1,18 @@
 <template>
 
   <v-container fluid>
-    <v-chip :variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Demandes d'exemplarisation
+    <v-chip :variant="isArchiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
+            @click="switchArchiveActiveDisplay(!isArchiveDemandesDisplayed)">Demandes d'exemplarisation
     </v-chip>
-    <v-chip :variant="!isActiveDemandesDisplayed ? 'plain' : 'tonal'"
-            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Demandes d'exemplarisation archivées
+    <v-chip :variant="!isArchiveDemandesDisplayed ? 'plain' : 'tonal'"
+            @click="switchArchiveActiveDisplay(!isArchiveDemandesDisplayed)">Demandes d'exemplarisation archivées
     </v-chip>
     <v-chip variant="text">
       <v-tooltip v-if="isAdmin" activator="parent" location="bottom">
         <template v-slot:activator="{ props }">
           <label>
             <input type="checkbox" v-model="extendedAllILN" style="margin-right: 5px"
-                   @change="loadItems('EXEMP', isActiveDemandesDisplayed)">
+                   @change="loadItems('EXEMP')">
             <span v-bind="props">Affichage étendu sur tous les ILN</span>
           </label>
         </template>
@@ -121,13 +121,13 @@
           <!-- 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-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
         </td>
       </tr>
     </template>
   </v-data-table>
   <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('EXEMP', isActiveDemandesDisplayed)"></dialog-suppression>
+                      @supp="loadItems('EXEMP')"></dialog-suppression>
 </template>
 
 <script setup>
@@ -288,11 +288,11 @@ const isDialogOpen = computed(() => {
 });
 //Actives or archives demands displayed
 
-const isActiveDemandesDisplayed = ref(false);
+const isArchiveDemandesDisplayed = ref(false);
 
 //Data initialisation
 onMounted(() => {
-  loadItems('EXEMP', isActiveDemandesDisplayed.value);
+  loadItems('EXEMP');
   contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
   itemService.getTypeExemp()
     .then(response => {
@@ -304,7 +304,7 @@ onMounted(() => {
     });
   polling = setInterval(() => {
     if (!isDialogOpen.value) {
-      loadItems('EXEMP', isActiveDemandesDisplayed.value)
+      loadItems('EXEMP')
         .then(() => {
           filterItems();
         });
@@ -317,13 +317,13 @@ onBeforeUnmount(() => {
 });
 
 function switchArchiveActiveDisplay(value) {
-  isActiveDemandesDisplayed.value = value;
-  loadItems('EXEMP', isActiveDemandesDisplayed.value);
+  isArchiveDemandesDisplayed.value = value;
+  loadItems('EXEMP');
 }
 
-async function loadItems(type, archive) {
+async function loadItems(type) {
   try {
-    const response = await itemService.fetchDemandes(type, archive, extendedAllILN.value);
+    const response = await itemService.fetchDemandes(type, isArchiveDemandesDisplayed.value, extendedAllILN.value);
     contentsDemandesFromServer.value = response.data;
     contentsDemandesFrontFiltered.value = response.data.map((item) => ({
       ...item,
@@ -374,6 +374,15 @@ function supprimerDemande(item) {
   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 {
@@ -394,7 +403,7 @@ function onRowClick(item) {
 }
 
 function saveComment() {
-  loadItems('EXEMP', isActiveDemandesDisplayed.value)
+  loadItems('EXEMP')
     .then(() => {
       filterItems();
     });
diff --git a/src/views/Modification/ModifTable.vue b/src/views/Modification/ModifTable.vue
index 1273ae4..e34ff8f 100644
--- a/src/views/Modification/ModifTable.vue
+++ b/src/views/Modification/ModifTable.vue
@@ -1,18 +1,17 @@
 <template>
   <v-container fluid>
-    <!--:variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" -->
-    <v-chip :variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Demandes de modification
+    <v-chip :variant="isArchiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
+            @click="switchArchiveActiveDisplay(!isArchiveDemandesDisplayed)">Demandes de modification
     </v-chip>
-    <v-chip :variant="!isActiveDemandesDisplayed ? 'plain' : 'tonal'"
-            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Demandes de modification archivées
+    <v-chip :variant="!isArchiveDemandesDisplayed ? 'plain' : 'tonal'"
+            @click="switchArchiveActiveDisplay(!isArchiveDemandesDisplayed)">Demandes de modification archivées
     </v-chip>
     <v-chip variant="text">
       <v-tooltip v-if="isAdmin" activator="parent" location="bottom">
         <template v-slot:activator="{ props }">
           <label>
             <input type="checkbox" v-model="extendedAllILN" style="margin-right: 5px"
-                   @change="loadItems('MODIF', isActiveDemandesDisplayed)">
+                   @change="loadItems('MODIF')">
             <span v-bind="props">Affichage étendu sur tous les ILN</span>
           </label>
         </template>
@@ -120,12 +119,13 @@
           <!-- 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-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
         </td>
       </tr>
     </template>
   </v-data-table>
   <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('MODIF', isActiveDemandesDisplayed)"></dialog-suppression>
+                      @supp="loadItems('MODIF')"></dialog-suppression>
 </template>
 
 <script setup>
@@ -286,11 +286,11 @@ const isDialogOpen = computed(() => {
 });
 
 //Actives or archives demands displayed
-const isActiveDemandesDisplayed = ref(false);
+const isArchiveDemandesDisplayed = ref(false);
 
 //Data initialisation
 onMounted(() => {
-  loadItems('MODIF', isActiveDemandesDisplayed.value);
+  loadItems('MODIF');
   contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
   itemService.getTypeTraitement()
     .then(response => {
@@ -302,7 +302,7 @@ onMounted(() => {
     });
   polling = setInterval(() => {
     if (!isDialogOpen.value) {
-      loadItems('MODIF', isActiveDemandesDisplayed.value)
+      loadItems('MODIF')
         .then(() => {
           filterItems();
         });
@@ -315,13 +315,13 @@ onBeforeUnmount(() => {
 });
 
 function switchArchiveActiveDisplay(value) {
-  isActiveDemandesDisplayed.value = value;
-  loadItems('MODIF', isActiveDemandesDisplayed.value);
+  isArchiveDemandesDisplayed.value = value;
+  loadItems('MODIF');
 }
 
-async function loadItems(type, archive) {
+async function loadItems(type) {
   try {
-    const response = await itemService.fetchDemandes(type, archive, extendedAllILN.value);
+    const response = await itemService.fetchDemandes(type, isArchiveDemandesDisplayed.value, extendedAllILN.value);
     contentsDemandesFromServer.value = response.data;
     contentsDemandesFrontFiltered.value = response.data.map((item) => ({
       ...item,
@@ -383,6 +383,15 @@ function supprimerDemande(item) {
   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 {
@@ -403,7 +412,7 @@ function onRowClick(item) {
 }
 
 function saveComment() {
-  loadItems('MODIF', isActiveDemandesDisplayed.value)
+  loadItems('MODIF')
     .then(() => {
       filterItems();
     });
diff --git a/src/views/Recouvrement/RecouvTable.vue b/src/views/Recouvrement/RecouvTable.vue
index fd6f33c..1b3bb02 100644
--- a/src/views/Recouvrement/RecouvTable.vue
+++ b/src/views/Recouvrement/RecouvTable.vue
@@ -1,17 +1,17 @@
 <template>
   <v-container fluid>
-    <v-chip :variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Demandes de recouvrement
+    <v-chip :variant="isArchiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
+            @click="switchArchiveActiveDisplay(!isArchiveDemandesDisplayed)">Demandes de recouvrement
     </v-chip>
-    <v-chip :variant="!isActiveDemandesDisplayed ? 'plain' : 'tonal'"
-            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Demandes de recouvrement archivées
+    <v-chip :variant="!isArchiveDemandesDisplayed ? 'plain' : 'tonal'"
+            @click="switchArchiveActiveDisplay(!isArchiveDemandesDisplayed)">Demandes de recouvrement archivées
     </v-chip>
     <v-chip variant="text">
       <v-tooltip v-if="isAdmin" activator="parent" location="bottom">
         <template v-slot:activator="{ props }">
           <label>
             <input type="checkbox" v-model="extendedAllILN" style="margin-right: 5px"
-                   @change="loadItems('RECOUV', isActiveDemandesDisplayed)">
+                   @change="loadItems('RECOUV')">
             <span v-bind="props">Affichage étendu sur tous les ILN</span>
           </label>
         </template>
@@ -108,12 +108,13 @@
           <!-- 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-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
         </td>
       </tr>
     </template>
   </v-data-table>
   <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('RECOUV', isActiveDemandesDisplayed)"></dialog-suppression>
+                      @supp="loadItems('RECOUV')"></dialog-suppression>
 </template>
 
 <script setup>
@@ -260,15 +261,15 @@ const isDialogOpen = computed(() => {
 });
 
 //Actives or archives demands displayed
-const isActiveDemandesDisplayed = ref(false);
+const isArchiveDemandesDisplayed = ref(false);
 
 //Data initialisation
 onMounted(() => {
-  loadItems('RECOUV', isActiveDemandesDisplayed.value);
+  loadItems('RECOUV');
   contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
   polling = setInterval(() => {
     if (!isDialogOpen.value) {
-      loadItems('RECOUV', isActiveDemandesDisplayed.value)
+      loadItems('RECOUV')
         .then(() => {
           filterItems();
         });
@@ -281,13 +282,13 @@ onBeforeUnmount(() => {
 });
 
 function switchArchiveActiveDisplay(value) {
-  isActiveDemandesDisplayed.value = value;
-  loadItems('RECOUV', isActiveDemandesDisplayed.value);
+  isArchiveDemandesDisplayed.value = value;
+  loadItems('RECOUV');
 }
 
-async function loadItems(type, archive) {
+async function loadItems(type) {
   try {
-    const response = await itemService.fetchDemandes(type, archive, extendedAllILN.value);
+    const response = await itemService.fetchDemandes(type, isArchiveDemandesDisplayed.value, extendedAllILN.value);
     contentsDemandesFromServer.value = response.data;
     contentsDemandesFrontFiltered.value = response.data.map((item) => ({
       ...item,
@@ -337,12 +338,21 @@ function supprimerDemande(item) {
   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('EXEMP', item.id);
+    await itemService.archiverDemande('RECOUV', item.id);
     // Mettre à jour les données après l'archivage réussi
-    await loadItems('EXEMP');
+    await loadItems('RECOUV');
     emit('backendSuccess');
   } catch (error) {
     console.error(error);
@@ -360,7 +370,7 @@ function saveAction() {
 }
 
 function saveComment() {
-  loadItems('RECOUV', isActiveDemandesDisplayed.value)
+  loadItems('RECOUV')
     .then(() => {
       filterItems();
     });
diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
index e67b014..5173b5d 100644
--- a/src/views/Suppression/SuppTable.vue
+++ b/src/views/Suppression/SuppTable.vue
@@ -110,6 +110,7 @@
           <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>
+          <v-btn v-if="item.etatDemande === 'Archivé'" variant="plain"  icon="mdi-package-up" @click="restaurerDemande(item)"></v-btn>
         </td>
       </tr>
     </template>
@@ -128,6 +129,7 @@ import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
 import moment from 'moment/moment';
 import {useAuthStore} from "@/store/authStore";
 import BtnStop from "@/components/Supp/BtnStop.vue";
+import itemService from "@/service/ItemService";
 
 //Emit
 const emit = defineEmits(['backendError', 'backendSuccess']);
@@ -270,7 +272,7 @@ const isArchiveDemandesDisplayed = ref(false);
 
 //Data initialisation
 onMounted(() => {
-  loadItems('SUPP', isArchiveDemandesDisplayed.value);
+  loadItems('SUPP');
   contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
   demandesService.getTypeTraitement()
     .then(response => {
@@ -282,7 +284,7 @@ onMounted(() => {
     });
   polling = setInterval(() => {
     if (!isDialogOpen.value) {
-      loadItems('SUPP', isArchiveDemandesDisplayed.value)
+      loadItems('SUPP')
         .then(() => {
           filterItems();
         });
@@ -296,12 +298,12 @@ onBeforeUnmount(() => {
 
 function switchArchiveActiveDisplay(value) {
   isArchiveDemandesDisplayed.value = value;
-  loadItems('SUPP', isArchiveDemandesDisplayed.value);
+  loadItems('SUPP');
 }
 
-async function loadItems(type, archive) {
+async function loadItems(type) {
   try {
-    const response = await demandesService.fetchDemandes(type, archive, extendedAllILN.value);
+    const response = await demandesService.fetchDemandes(type, isArchiveDemandesDisplayed.value, extendedAllILN.value);
     contentsDemandesFromServer.value = response.data;
     contentsDemandesFrontFiltered.value = response.data.map((item) => ({
       ...item,
@@ -366,12 +368,21 @@ function supprimerDemande(item) {
   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', isArchiveDemandesDisplayed.value);
+    await loadItems('SUPP');
     emit('backendSuccess');
   } catch (error) {
     console.error(error);
@@ -386,7 +397,7 @@ function onRowClick(item) {
 }
 
 function saveComment() {
-  loadItems('SUPP', isArchiveDemandesDisplayed.value)
+  loadItems('SUPP')
     .then(() => {
       filterItems();
     });

From f77b65dfc345876c4fb5f0d13092e72e2a948f1a Mon Sep 17 00:00:00 2001
From: SamuelQuetin <samquetinuel@gmail.com>
Date: Fri, 6 Dec 2024 09:40:24 +0100
Subject: [PATCH 2/4] Ajout du catch du message d'erreur

---
 src/components/Supp/BtnStop.vue               | 23 ++++++++-------
 .../Supp/DialogConfirmationStop.vue           | 28 +++++++++++--------
 src/views/Suppression/SuppTable.vue           | 17 ++++++-----
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/components/Supp/BtnStop.vue b/src/components/Supp/BtnStop.vue
index 6d866ff..76fa34a 100644
--- a/src/components/Supp/BtnStop.vue
+++ b/src/components/Supp/BtnStop.vue
@@ -1,25 +1,28 @@
 <template>
-  <v-btn icon="mdi-stop"  variant="plain" @click="click">
+  <v-btn icon="mdi-stop" variant="plain" @click="click">
   </v-btn>
-  <dialog-confirmation-stop v-model="dialog" :id="id" @stop="emits('stop')">
+  <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";
+import DialogConfirmationStop from '@/components/Supp/DialogConfirmationStop.vue';
+import { ref } from 'vue';
 
-const emits = defineEmits(['stop'])
+const emits = defineEmits(['stop', 'onError']);
 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;
 }
 
+function throwError(err) {
+  emits('onError', err);
+}
 
 </script>
diff --git a/src/components/Supp/DialogConfirmationStop.vue b/src/components/Supp/DialogConfirmationStop.vue
index 0f8c046..08c8e1a 100644
--- a/src/components/Supp/DialogConfirmationStop.vue
+++ b/src/components/Supp/DialogConfirmationStop.vue
@@ -3,7 +3,7 @@
     <v-card>
       <v-card-title>Confirmation</v-card-title>
       <v-card-text>
-        Voulez vous vraiment stopper le traitement sur la demande N°{{id}} ?
+        Voulez vous vraiment stopper le traitement sur la demande N°{{ id }} ?
       </v-card-text>
       <v-card-actions>
         <v-btn @click="dialog=false">Refuser</v-btn>
@@ -13,21 +13,25 @@
   </v-dialog>
 </template>
 <script setup>
-import itemService from "@/service/ItemService";
+import itemService from '@/service/ItemService';
 
-const emits = defineEmits(['stop'])
+const emits = defineEmits(['stop', 'onError']);
 const dialog = defineModel();
 const props = defineProps({
-  id:{
-    required:true,
-    type:Number
+  id: {
+    required: true,
+    type: Number
   }
-})
+});
 
-function stopDemande(){
-  itemService.stopDemande(props.id).finally(() => {
-    dialog.value = false;
-    emits('stop');
-  });
+function stopDemande() {
+  itemService.stopDemande(props.id)
+    .catch(err => {
+      emits('onError', err);
+    })
+    .finally(() => {
+      dialog.value = false;
+      emits('stop');
+    });
 }
 </script>
diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
index e67b014..a6a804c 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,7 +108,8 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <btn-stop v-if="canStop(item)" :id="item.id" @stop="loadItems('SUPP', isArchiveDemandesDisplayed)"></btn-stop>
+          <btn-stop v-if="canStop(item)" :id="item.id" @stop="loadItems('SUPP', isArchiveDemandesDisplayed)"
+                    @on-error="throwError"></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>
         </td>
@@ -126,14 +128,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(true); // todo Pour les tests il faut laisser à true/ pour la prod faudra mettre à false
 const headingsDemandes = [
   {
@@ -226,7 +229,7 @@ const headingsDemandes = [
 ];
 const filteredHeadingsDemandes = computed(() =>
   headingsDemandes.filter(heading => heading.display !== false)
-)
+);
 
 const listStatut = [
   'En saisie',
@@ -357,7 +360,7 @@ function canCancel(item) {
 }
 
 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 514f5e6975c6fe2d1d03e26db1cd31ded36d122c Mon Sep 17 00:00:00 2001
From: pierre-maraval <pierre.maraval@gmail.com>
Date: Fri, 6 Dec 2024 10:34:30 +0100
Subject: [PATCH 3/4] =?UTF-8?q?Refactor=20:=20Suppression=20coche=20par=20?=
 =?UTF-8?q?d=C3=A9faut=20sur=20affichage=20=C3=A9tendu=20demandes=20de=20s?=
 =?UTF-8?q?uppression?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Suppression/SuppTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
index e67b014..4b5d3e0 100644
--- a/src/views/Suppression/SuppTable.vue
+++ b/src/views/Suppression/SuppTable.vue
@@ -134,7 +134,7 @@ const emit = defineEmits(['backendError', 'backendSuccess']);
 
 //Data
 const isAdmin = useAuthStore().isAdmin();
-const extendedAllILN = ref(true); // todo Pour les tests il faut laisser à true/ pour la prod faudra mettre à false
+const extendedAllILN = ref(false);
 const headingsDemandes = [
   {
     title: '',

From 4d78c1454b8e52a31f5d90f3a7c0defa9cbc8c2d Mon Sep 17 00:00:00 2001
From: SamuelQuetin <samquetinuel@gmail.com>
Date: Fri, 6 Dec 2024 11:25:49 +0100
Subject: [PATCH 4/4] Ajout refresh a chaque fois qu'on revient en simu

---
 src/components/Simulation.vue            |  51 ++++----
 src/views/Exemplarisation/ExempSteps.vue |  88 ++++++++------
 src/views/Modification/ModifSteps.vue    |  89 ++++++++------
 src/views/Suppression/SuppSteps.vue      | 144 +++++++++++++----------
 4 files changed, 211 insertions(+), 161 deletions(-)

diff --git a/src/components/Simulation.vue b/src/components/Simulation.vue
index 8e04547..3c8f9f4 100644
--- a/src/components/Simulation.vue
+++ b/src/components/Simulation.vue
@@ -10,14 +10,16 @@
 
   <recap-demande :demande="demande"></recap-demande>
   <!-- CONTENU SIMULATION -->
-  <v-alert icon="mdi-alert" type="error" v-if="alertMessageError" class="my-3" border="left">Simulation impossible : {{ alertMessageError }}</v-alert>
+  <v-alert icon="mdi-alert" type="error" v-if="alertMessageError" class="my-3" border="left">Simulation impossible :
+    {{ alertMessageError }}
+  </v-alert>
   <v-card flat class="pb-2">
     <v-card-title class="d-flex justify-space-between custom-card-title">
       <span>Ecran de simulation</span>
       <v-btn depressed variant="text" @click="deleted()" prepend-icon="mdi-delete">Supprimer</v-btn>
     </v-card-title>
     <!--TEMPLATE DE SIMULATION-->
-    <v-alert type="warning"  class="my-3 pa-2" dense prominent border="left">
+    <v-alert type="warning" class="my-3 pa-2" dense prominent border="left">
       Cet écran est une <strong>prévisualisation</strong> du traitement.<br>
       Il s'agit de la <strong>dernière étape</strong> avant de lancer le traitement en <strong>base de
       production</strong>. Merci de <strong>vérifier vos données</strong>.
@@ -36,7 +38,7 @@
         </v-card>
       </v-col>
       <v-col cols="12" sm="12" md="2" class="pb-10">
-        <navigate-notice v-model="nbNotice" @clicked="refresh()"></navigate-notice>
+        <navigate-notice v-model="nbNotice" @clicked="refresh(nbNotice.nbNoticeEnCours)"></navigate-notice>
       </v-col>
       <v-col cols="12" sm="12" md="5"> <!--Exemplaire à créer-->
         <v-card class="pa-1 mr-1" outlined tile>
@@ -54,7 +56,7 @@
 
 import RecapDemande from '@/components/RecapDemande.vue';
 import NavigateNotice from '@/components/NavigateNotice.vue';
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watchEffect } from 'vue';
 import itemService from '@/service/ItemService';
 
 const props = defineProps({
@@ -71,48 +73,44 @@ const props = defineProps({
     default: 'Après'
   }
 });
-const emits = defineEmits(['deleted'])
+const emits = defineEmits(['deleted']);
 
 const nbNotice = ref({
   nbNoticeEnCours: 0,
   nbTotalNotice: 0
 });
 const numeroPPNNotice = ref();
-const noticeAvant = ref("");
-const noticeApres = ref("");
+const noticeAvant = ref('');
+const noticeApres = ref('');
 const isLoading = ref(true);
 const alertMessageError = ref();
 
 onMounted(() => {
-  itemService.getNbLigneFichier(props.demande.id, props.demande.type)
-    .then(response => {
-      nbNotice.value.nbTotalNotice = response.data;
-    });
-  itemService.simulerLigne(props.demande.id, 0, props.demande.type)
-    .then(response => {
-      numeroPPNNotice.value = response.data[0];
-      noticeAvant.value = response.data[1];
-      noticeApres.value = response.data[2];
-    })
-    .catch(err => {
-      alertMessageError.value = err.response.data.message
-    })
-    .finally(() => {
-      isLoading.value = false;
-    });
+  refresh(0);
+});
+
+watchEffect(() => {
+  if (props.demande.etatDemande === 'En simulation') {
+    refresh(0);
+  }
 });
 
-function refresh() {
+//nbNotice.value.nbNoticeEnCours
+function refresh(nbNoticeEnCours) {
   isLoading.value = true;
   alertMessageError.value = null;
-  itemService.simulerLigne(props.demande.id, nbNotice.value.nbNoticeEnCours, props.demande.type)
+  itemService.getNbLigneFichier(props.demande.id, props.demande.type)
+    .then(response => {
+      nbNotice.value.nbTotalNotice = response.data;
+    });
+  itemService.simulerLigne(props.demande.id, nbNoticeEnCours, props.demande.type)
     .then(response => {
       numeroPPNNotice.value = response.data[0];
       noticeAvant.value = response.data[1];
       noticeApres.value = response.data[2];
     })
     .catch(err => {
-      alertMessageError.value = err.response.data.message
+      alertMessageError.value = err.response.data.message;
     })
     .finally(() => {
       isLoading.value = false;
@@ -134,6 +132,7 @@ h4 {
   font-size: x-large;
   font-weight: normal;
 }
+
 h5 {
   font-size: x-large;
   font-weight: normal;
diff --git a/src/views/Exemplarisation/ExempSteps.vue b/src/views/Exemplarisation/ExempSteps.vue
index da8f71b..be99482 100644
--- a/src/views/Exemplarisation/ExempSteps.vue
+++ b/src/views/Exemplarisation/ExempSteps.vue
@@ -6,7 +6,7 @@
       </v-row>
       <v-row align="center" justify="center">
         <v-col :md="(currentStep === 3) ? '' : '7'">
-          <v-stepper  v-model="currentStep" @update:model-value="changeEtat()" alt-labels>
+          <v-stepper v-model="currentStep" @update:model-value="changeEtat()" alt-labels>
             <v-stepper-header>
               <v-stepper-item
                 :color="currentStep >= 0 ? 'primary' : ''"
@@ -58,7 +58,8 @@
                 </v-container>
               </v-stepper-window-item>
               <v-stepper-window-item>
-                <type-exemp v-model="typeDocumentSelected" :is-loading="isLoading" @deleted="deleteDemande()" @click="modifiTypeExemp"></type-exemp>
+                <type-exemp v-model="typeDocumentSelected" :is-loading="isLoading" @deleted="deleteDemande()"
+                            @click="modifiTypeExemp"></type-exemp>
                 <v-container class="d-flex justify-space-between">
                   <v-btn @click="prev">
                     précédent
@@ -66,7 +67,9 @@
                 </v-container>
               </v-stepper-window-item>
               <v-stepper-window-item>
-                <select-file v-model="fileSelected" :is-loading="isLoading" @deleted="deleteDemande()">Charger le fichier des exemplaires à traiter</select-file>
+                <select-file v-model="fileSelected" :is-loading="isLoading" @deleted="deleteDemande()">Charger le
+                  fichier des exemplaires à traiter
+                </select-file>
                 <v-alert
                   v-if="alertMessage"
                   :type="alertType"
@@ -86,7 +89,8 @@
                 </v-container>
               </v-stepper-window-item>
               <v-stepper-window-item>
-                <simulation :demande="demande" label-before="Exemplaire(s) existant(s)" label-after="Exemplaire à créer" @deleted="deleteDemande()"></simulation>
+                <simulation :demande="demande" label-before="Exemplaire(s) existant(s)" label-after="Exemplaire à créer"
+                            @deleted="deleteDemande()"></simulation>
                 <v-container class="d-flex justify-space-between">
                   <v-btn @click="prev">
                     précédent
@@ -102,30 +106,31 @@
       </v-row>
     </v-col>
   </v-container>
-  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" rubrique="Gérer mes créations" route="exemplarisation-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
-  <dialog-suppression  v-model="suppDialog" :demande="demande" return-to-accueil></dialog-suppression>
+  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" rubrique="Gérer mes créations"
+                            route="exemplarisation-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
+  <dialog-suppression v-model="suppDialog" :demande="demande" return-to-accueil></dialog-suppression>
 </template>
 
 <script setup>
 
-import {onMounted, ref} from 'vue'
+import { onMounted, ref } from 'vue';
 import itemService from '@/service/ItemService';
 import router from '@/router';
 import SelectFile from '@/components/SelectFile.vue';
 import Rcr from '@/components/Rcr.vue';
 import TypeExemp from '@/components/Exemp/TypeExemp.vue';
-import Simulation from "@/components/Simulation.vue";
+import Simulation from '@/components/Simulation.vue';
 import DialogLancerTraitement from '@/components/Dialog/DialogLancerTraitement.vue';
 import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import RecapDemande from '@/components/RecapDemande.vue';
 
-const emits = defineEmits(['backendError', 'backendSuccess', 'login-success'])
-const props = defineProps({id : {type: String}});
+const emits = defineEmits(['backendError', 'backendSuccess', 'login-success']);
+const props = defineProps({ id: { type: String } });
 
 const demande = ref();
 const currentStep = ref(0);
 const typeDocumentSelected = ref();
-const rcrSelected = ref()
+const rcrSelected = ref();
 const fileSelected = ref();
 const alertMessage = ref();
 const alertType = ref();
@@ -133,9 +138,9 @@ const isLoading = ref(false);
 const dialog = ref(false);
 const suppDialog = ref(false);
 
-onMounted(()=>{
-  if(props.id){
-    itemService.getDemande(props.id, "EXEMP")
+onMounted(() => {
+  if (props.id) {
+    itemService.getDemande(props.id, 'EXEMP')
       .then(response => {
         demande.value = response.data;
         switch (demande.value.etatDemande) {
@@ -160,11 +165,12 @@ onMounted(()=>{
             };
             break;
         }
-      }).catch(() => {
-      router.replace("/exemplarisation");
-    })
+      })
+      .catch(() => {
+        router.replace('/exemplarisation');
+      });
   }
-})
+});
 
 function createDemande() {
   if (demande.value && (rcrSelected.value === demande.value.rcr)) {
@@ -175,9 +181,11 @@ function createDemande() {
       .then(response => {
         demande.value = response.data;
         next();
-      }).catch(err => {
-        emits('backendError',err);
-      }).finally(() => {
+      })
+      .catch(err => {
+        emits('backendError', err);
+      })
+      .finally(() => {
         isLoading.value = false;
       });
   } else {
@@ -185,25 +193,27 @@ function createDemande() {
     itemService.creerDemande(rcrSelected.value, 'EXEMP')
       .then(response => {
         demande.value = response.data;
-        router.replace(`/exemplarisation/${demande.value.id}`)
+        router.replace(`/exemplarisation/${demande.value.id}`);
         next();
-      }).catch(err => {
-        emits('backendError',err);
-      }).finally(() => {
+      })
+      .catch(err => {
+        emits('backendError', err);
+      })
+      .finally(() => {
         isLoading.value = false;
       });
   }
 }
 
 function modifiTypeExemp() {
-  if(demande.value.typeExemp === typeDocumentSelected.value.libelle){
+  if (demande.value.typeExemp === typeDocumentSelected.value.libelle) {
     next();
   } else {
     isLoading.value = true;
     itemService.modifierTypeExempDemande(demande.value.id, typeDocumentSelected.value.id)
       .then(response => {
-        demande.value = response.data
-        next()
+        demande.value = response.data;
+        next();
       })
       .catch(err => {
         emits('backendError', err);
@@ -220,7 +230,11 @@ function uploadFile() {
   isLoading.value = true;
   itemService.uploadDemande(demande.value.id, fileSelected.value, 'EXEMP')
     .then(() => {
-      alertMessage.value = "Fichier envoyé";
+      alertMessage.value = 'Fichier envoyé';
+      itemService.getDemande(demande.value.id, demande.value.type)
+        .then(response => {
+          demande.value = response.data;
+        });
       next();
     })
     .catch(err => {
@@ -232,23 +246,25 @@ function uploadFile() {
     });
 }
 
-function launchDemande(){
+function launchDemande() {
   isLoading.value = true;
-  itemService.lancerDemande(demande.value.id,'EXEMP')
+  itemService.lancerDemande(demande.value.id, 'EXEMP')
     .then(response => {
       demande.value = response.data;
-    }).finally(() => {
+    })
+    .finally(() => {
       isLoading.value = false;
-  })
+    });
 }
 
-function deleteDemande(){
+function deleteDemande() {
   suppDialog.value = true;
 }
 
 function next() {
   currentStep.value++;
 }
+
 function prev() {
   currentStep.value--;
   changeEtat();
@@ -259,9 +275,9 @@ function changeEtat() {
     itemService.choixEtape(demande.value.id, 2, 'EXEMP')
       .then(response => {
         demande.value = response.data;
-      })
+      });
   }
-  if((currentStep.value + 1) === 3) { //Changement d'etat pour le chargement du fichier car le back est perdu sinon
+  if ((currentStep.value + 1) === 3) { //Changement d'etat pour le chargement du fichier car le back est perdu sinon
     itemService.choixEtape(demande.value.id, currentStep.value + 1, 'EXEMP')
       .then(response => {
         demande.value = response.data;
diff --git a/src/views/Modification/ModifSteps.vue b/src/views/Modification/ModifSteps.vue
index a0eb32a..584e249 100644
--- a/src/views/Modification/ModifSteps.vue
+++ b/src/views/Modification/ModifSteps.vue
@@ -151,24 +151,24 @@
       </v-row>
     </v-col>
   </v-container>
-  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" rubrique="Gérer mes modifications" route="modification-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
+  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" rubrique="Gérer mes modifications"
+                            route="modification-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
   <dialog-suppression v-model="suppDialog" :demande="demande" return-to-accueil></dialog-suppression>
 </template>
 
 <script setup>
-import {onMounted, ref} from 'vue';
+import { onMounted, ref } from 'vue';
 import router from '@/router';
 import itemService from '@/service/ItemService';
 import Rcr from '@/components/Rcr.vue';
 import SelectFile from '@/components/SelectFile.vue';
 import DownloadFile from '@/components/DownloadFile.vue';
 import TypeTraitement from '@/components/Modif/TypeTraitement.vue';
-import Simulation from "@/components/Simulation.vue";
+import Simulation from '@/components/Simulation.vue';
 import DialogLancerTraitement from '@/components/Dialog/DialogLancerTraitement.vue';
 import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import RecapDemande from '@/components/RecapDemande.vue';
 
-
 const currentStep = ref(0);
 const demande = ref();
 const rcrSelected = ref();
@@ -186,12 +186,11 @@ const fileName = ref('');
 const typeTraitementSelected = ref();
 
 const emits = defineEmits(['backendError']);
-const props = defineProps({id: {type: String}});
-
+const props = defineProps({ id: { type: String } });
 
 onMounted(() => {
   if (props.id) {
-    itemService.getDemande(props.id, "MODIF")
+    itemService.getDemande(props.id, 'MODIF')
       .then(response => {
         demande.value = response.data;
         switch (demande.value.etatDemande) {
@@ -224,11 +223,12 @@ onMounted(() => {
             };
             break;
         }
-      }).catch(() => {
-      router.replace("/modification");
-    })
+      })
+      .catch(() => {
+        router.replace('/modification');
+      });
   }
-})
+});
 
 function createDemande() {
   if (demande.value && (rcrSelected.value === demande.value.rcr)) {
@@ -239,23 +239,27 @@ function createDemande() {
       .then(response => {
         demande.value = response.data;
         next();
-      }).catch(err => {
-      emits('backendError', err);
-    }).finally(() => {
-      isLoading.value = false;
-    });
+      })
+      .catch(err => {
+        emits('backendError', err);
+      })
+      .finally(() => {
+        isLoading.value = false;
+      });
   } else {
     isLoading.value = true;
     itemService.creerDemande(rcrSelected.value, 'MODIF')
       .then(response => {
         demande.value = response.data;
-        router.replace(`/modification/${demande.value.id}`)
+        router.replace(`/modification/${demande.value.id}`);
         next();
-      }).catch(err => {
-      emits('backendError', err);
-    }).finally(() => {
-      isLoading.value = false;
-    });
+      })
+      .catch(err => {
+        emits('backendError', err);
+      })
+      .finally(() => {
+        isLoading.value = false;
+      });
   }
 }
 
@@ -263,16 +267,16 @@ function uploadFileInit() {
   alertMessage.value = '';
   alertType.value = 'success';
   isLoading.value = true;
-  itemService.uploadDemande(demande.value.id, fileInitSelected.value, 'MODIF')
+  itemService.uploadDemande(demande.value.id, fileInitSelected.value, demande.value.type)
     .then(() => {
-      alertMessage.value = "Fichier envoyé";
-      itemService.getFile(demande.value.id, 'MODIF','fichier_prepare', '.csv')
+      alertMessage.value = 'Fichier envoyé';
+      itemService.getFile(demande.value.id, 'MODIF', 'fichier_prepare', '.csv')
         .then(response => {
-          let blob = new Blob([response.data], {type: 'application/csv'});
+          let blob = new Blob([response.data], { type: 'application/csv' });
           fileLink.value = window.URL.createObjectURL(blob);
           fileName.value = `fichier_demande_${demande.value.id}.csv`;
           isLoaded.value = true;
-        })
+        });
     })
     .catch(err => {
       alertMessage.value = err.response.data.message;
@@ -289,7 +293,11 @@ function uploadFileFinal() {
   isLoading.value = true;
   itemService.uploadDemande(demande.value.id, fileFinalSelected.value, 'MODIF')
     .then(() => {
-      alertMessage.value = "Fichier envoyé";
+      itemService.getDemande(demande.value.id, demande.value.type)
+        .then(response => {
+          demande.value = response.data;
+        });
+      alertMessage.value = 'Fichier envoyé';
       isLoaded.value = true;
       next();
     })
@@ -307,22 +315,25 @@ function modifierTypeTraitementModifDemande() {
   itemService.modifierTypeTraitementModifDemande(demande.value.id, typeTraitementSelected.value.id)
     .then(response => {
       demande.value = response.data;
-      next()
-    }).catch(err => {
-    emits('backendError', err);
-  }).finally(() => {
-    isLoading.value = false;
-  });
+      next();
+    })
+    .catch(err => {
+      emits('backendError', err);
+    })
+    .finally(() => {
+      isLoading.value = false;
+    });
 }
 
-function launchDemande(){
+function launchDemande() {
   isLoading.value = true;
-  itemService.lancerDemande(demande.value.id,'MODIF')
+  itemService.lancerDemande(demande.value.id, 'MODIF')
     .then(response => {
       demande.value = response.data;
-    }).finally(() => {
-    isLoading.value = false;
-  })
+    })
+    .finally(() => {
+      isLoading.value = false;
+    });
 }
 
 function downloaded() {
diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue
index d4e236a..6b50107 100644
--- a/src/views/Suppression/SuppSteps.vue
+++ b/src/views/Suppression/SuppSteps.vue
@@ -59,9 +59,15 @@
                 </v-container>
               </v-stepper-window-item>
               <v-stepper-window-item>
-                <type-file v-if="!typeFileSelected" v-model="typeFileSelected" @clicked="setTypeSelected()" @deleted="deleteDemande()"></type-file>
-                <select-file v-else-if="!isLoaded" :is-loading="isLoading" v-model="fileSelected" typeFile="PPN" @deleted="deleteDemande()">Selection du fichier PPN</select-file>
-                <download-file v-if="isLoaded" :file-link="fileLink" :file-name="fileName" @clicked="isDownloaded = true" @deleted="deleteDemande()">Téléchargement du fichier PPN/RCR/EPN</download-file>
+                <type-file v-if="!typeFileSelected" v-model="typeFileSelected" @clicked="setTypeSelected()"
+                           @deleted="deleteDemande()"></type-file>
+                <select-file v-else-if="!isLoaded" :is-loading="isLoading" v-model="fileSelected" typeFile="PPN"
+                             @deleted="deleteDemande()">Selection du fichier PPN
+                </select-file>
+                <download-file v-if="isLoaded" :file-link="fileLink" :file-name="fileName"
+                               @clicked="isDownloaded = true" @deleted="deleteDemande()">Téléchargement du fichier
+                  PPN/RCR/EPN
+                </download-file>
                 <v-alert
                   v-if="alertMessage"
                   :type="alertType"
@@ -98,10 +104,13 @@
               </v-stepper-window-item>
               <v-stepper-window-item>
                 <v-container>
-                  <select-file v-if="typeFileSelected==='PPN'" v-model="fileFinalSelected" :is-loading="isLoading" @deleted="deleteDemande()">Charger le
+                  <select-file v-if="typeFileSelected==='PPN'" v-model="fileFinalSelected" :is-loading="isLoading"
+                               @deleted="deleteDemande()">Charger le
                     fichier des exemplaires à supprimer
                   </select-file>
-                  <select-file v-else-if="typeFileSelected==='EPN'" v-model="fileSelected"  :is-loading="isLoading" typeFile="EPN" @deleted="deleteDemande()">Selection du fichier EPN</select-file>
+                  <select-file v-else-if="typeFileSelected==='EPN'" v-model="fileSelected" :is-loading="isLoading"
+                               typeFile="EPN" @deleted="deleteDemande()">Selection du fichier EPN
+                  </select-file>
                   <v-alert
                     v-if="alertMessage"
                     :type="alertType"
@@ -124,7 +133,8 @@
                 </v-container>
               </v-stepper-window-item>
               <v-stepper-window-item>
-                <simulation :demande="demande" label-before="Exemplaire(s) existant(s)" label-after="Exemplaire(s) restant(s)" @deleted="deleteDemande()"></simulation>
+                <simulation v-if="currentStep===3" :demande="demande" label-before="Exemplaire(s) existant(s)"
+                            label-after="Exemplaire(s) restant(s)" @deleted="deleteDemande()"></simulation>
                 <v-container class="d-flex justify-space-between">
                   <v-btn @click="prev">
                     précédent
@@ -154,10 +164,10 @@ import { onMounted, ref } from 'vue';
 import TypeFile from '@/components/Supp/TypeFile.vue';
 import SelectFile from '@/components/SelectFile.vue';
 import itemService from '@/service/ItemService';
-import DownloadFile from "@/components/DownloadFile.vue";
-import router from '@/router'
+import DownloadFile from '@/components/DownloadFile.vue';
+import router from '@/router';
 import Rcr from '@/components/Rcr.vue';
-import Simulation from "@/components/Simulation.vue";
+import Simulation from '@/components/Simulation.vue';
 import DialogLancerTraitement from '@/components/Dialog/DialogLancerTraitement.vue';
 import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import RecapDemande from '@/components/RecapDemande.vue';
@@ -166,7 +176,7 @@ const currentStep = ref(0);
 const demande = ref();
 
 const emits = defineEmits(['backendError']);
-const props = defineProps({id: {type: String}});
+const props = defineProps({ id: { type: String } });
 
 const rcrSelected = ref('');
 const typeFileSelected = ref('');
@@ -182,18 +192,18 @@ const alertType = ref('success');
 const dialog = ref(false);
 const suppDialog = ref(false);
 
-onMounted(()=>{
+onMounted(() => {
   if (props.id) {
-    itemService.getDemande(props.id, "SUPP")
+    itemService.getDemande(props.id, 'SUPP')
       .then(response => {
         demande.value = response.data;
         switch (demande.value.etatDemande) {
           case 'En préparation':
             currentStep.value = 1;
             rcrSelected.value = demande.value.rcr;
-            if (demande.value.typeSuppression){
+            if (demande.value.typeSuppression) {
               typeFileSelected.value = demande.value.typeSuppression;
-              if(demande.value.typeSuppression === "EPN"){
+              if (demande.value.typeSuppression === 'EPN') {
                 currentStep.value = 2;
               }
             }
@@ -214,12 +224,12 @@ onMounted(()=>{
             currentStep.value = 3;
             break;
         }
-      }).catch(() => {
-      router.replace("/suppression");
-    })
+      })
+      .catch(() => {
+        router.replace('/suppression');
+      });
   }
-})
-
+});
 
 function createDemande() {
   if (demande.value && (rcrSelected.value === demande.value.rcr)) {
@@ -230,23 +240,27 @@ function createDemande() {
       .then(response => {
         demande.value = response.data;
         next();
-      }).catch(err => {
-      emits('backendError', err);
-    }).finally(() => {
-      isLoading.value = false;
-    });
+      })
+      .catch(err => {
+        emits('backendError', err);
+      })
+      .finally(() => {
+        isLoading.value = false;
+      });
   } else {
     isLoading.value = true;
     itemService.creerDemande(rcrSelected.value, 'SUPP')
       .then(response => {
         demande.value = response.data;
-        router.replace(`/suppression/${demande.value.id}`)
+        router.replace(`/suppression/${demande.value.id}`);
         next();
-      }).catch(err => {
-      emits('backendError', err);
-    }).finally(() => {
-      isLoading.value = false;
-    });
+      })
+      .catch(err => {
+        emits('backendError', err);
+      })
+      .finally(() => {
+        isLoading.value = false;
+      });
   }
 }
 
@@ -256,14 +270,14 @@ function uploadFile() {
   isLoading.value = true;
   itemService.uploadDemande(demande.value.id, fileSelected.value, 'SUPP')
     .then(() => {
-      alertMessage.value = "Fichier envoyé";
-      itemService.getFile(demande.value.id, 'SUPP','fichier_correspondance', '.csv')
+      alertMessage.value = 'Fichier envoyé';
+      itemService.getFile(demande.value.id, 'SUPP', 'fichier_correspondance', '.csv')
         .then(response => {
-          let blob = new Blob([response.data], {type: 'application/csv'});
+          let blob = new Blob([response.data], { type: 'application/csv' });
           fileLink.value = window.URL.createObjectURL(blob);
           fileName.value = `fichier_demande_${demande.value.id}.csv`;
           isLoaded.value = true;
-        })
+        });
     })
     .catch(err => {
       alertMessage.value = err.response.data.message;
@@ -273,9 +287,10 @@ function uploadFile() {
       isLoading.value = false;
     });
 }
-function setTypeSelected(){
+
+function setTypeSelected() {
   itemService.modifierTypeFileDemande(demande.value.id, typeFileSelected.value);
-  if (typeFileSelected.value==='EPN'){
+  if (typeFileSelected.value === 'EPN') {
     next();
   }
 }
@@ -284,10 +299,14 @@ function uploadFileFinal() {
   alertMessage.value = '';
   alertType.value = 'success';
   isLoading.value = true;
-  if (typeFileSelected.value==='PPN'){
-    itemService.uploadDemande(demande.value.id, fileFinalSelected.value, 'SUPP')
+  if (typeFileSelected.value === 'PPN') {
+    itemService.uploadDemande(demande.value.id, fileFinalSelected.value, demande.value.type)
       .then(() => {
-        alertMessage.value = "Fichier envoyé";
+        alertMessage.value = 'Fichier envoyé';
+        itemService.getDemande(demande.value.id, demande.value.type)
+          .then(response => {
+            demande.value = response.data;
+          });
         next();
       })
       .catch(err => {
@@ -297,14 +316,14 @@ function uploadFileFinal() {
       .finally(() => {
         isLoading.value = false;
       });
-  } else if (typeFileSelected.value==='EPN') {
-    itemService.uploadDemande(demande.value.id, fileSelected.value, 'SUPP')
+  } else if (typeFileSelected.value === 'EPN') {
+    itemService.uploadDemande(demande.value.id, fileSelected.value, demande.value.type)
       .then(() => {
-        alertMessage.value = "Fichier envoyé, veuillez patienter quelques instants.";
-        itemService.getFile(demande.value.id, 'SUPP','fichier_correspondance', '.csv')
+        alertMessage.value = 'Fichier envoyé, veuillez patienter quelques instants.';
+        itemService.getFile(demande.value.id, 'SUPP', 'fichier_correspondance', '.csv')
           .then(response => {
-            let blob = new Blob([response.data], {type: 'application/csv'});
-            itemService.uploadDemande(demande.value.id, blob, 'SUPP')
+            let blob = new Blob([response.data], { type: 'application/csv' });
+            itemService.uploadDemande(demande.value.id, blob, demande.value.type)
               .then(() => {
                 goSimulation();
               })
@@ -343,14 +362,16 @@ function changeEtape() {
     typeFileSelected.value = null;
   }
   if ((currentStep.value + 1) === 2 && typeFileSelected.value) { //Changement d'etat pour le chargement du fichier car le back est perdu sinon
-    if(typeFileSelected.value==='EPN') {typeFileSelected.value=null;}
+    if (typeFileSelected.value === 'EPN') {
+      typeFileSelected.value = null;
+    }
     itemService.choixEtape(demande.value.id, 2, 'SUPP')
       .then(response => {
         demande.value = response.data;
       });
   }
-  if ((currentStep.value + 1) === 3 ) {
-    if(typeFileSelected.value==='EPN'){
+  if ((currentStep.value + 1) === 3) {
+    if (typeFileSelected.value === 'EPN') {
       itemService.choixEtape(demande.value.id, 2, 'SUPP')
         .then(response => {
           demande.value = response.data;
@@ -364,32 +385,34 @@ function changeEtape() {
   }
 }
 
-function prevSelectTypeFile(){
+function prevSelectTypeFile() {
   typeFileSelected.value = null;
-  changeEtape()
+  changeEtape();
   raz();
 }
-function prevSelectFile(){
-  changeEtape()
+
+function prevSelectFile() {
+  changeEtape();
   raz();
 }
+
 function next() {
   currentStep.value++;
   raz();
 }
 
-function goSimulation(){
+function goSimulation() {
   currentStep.value = 3;
   raz();
 }
 
 function prev() {
   currentStep.value--;
-  changeEtape()
+  changeEtape();
   raz();
 }
 
-function raz(){
+function raz() {
   isLoading.value = false;
   alertMessage.value = '';
   alertType.value = 'success';
@@ -397,14 +420,15 @@ function raz(){
   isDownloaded.value = false;
 }
 
-function launchDemande(){
+function launchDemande() {
   isLoading.value = true;
-  itemService.lancerDemande(demande.value.id,'SUPP')
+  itemService.lancerDemande(demande.value.id, 'SUPP')
     .then(response => {
       demande.value = response.data;
-    }).finally(() => {
-    isLoading.value = false;
-  })
+    })
+    .finally(() => {
+      isLoading.value = false;
+    });
 }
 
 function deleteDemande() {