From 813c39977496f926a015a2b83e139f6405d4824b Mon Sep 17 00:00:00 2001
From: Jerome Villiseck <jerome.villiseck@outlook.com>
Date: Wed, 21 Aug 2024 10:59:39 +0200
Subject: [PATCH 1/2] =?UTF-8?q?-=20Mise=20en=20place=20de=20l'=C3=A9cran?=
 =?UTF-8?q?=20de=20chargement=20du=20fichier=20enrichi=20et=20gestion=20de?=
 =?UTF-8?q?=20la=20popup=20de=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialog/DialogLancerTraitement.vue         |  8 ++-
 src/views/Exemplarisation/ExempSteps.vue      |  2 +-
 src/views/Modification/ModifSteps.vue         |  2 +-
 src/views/Recouvrement/RecouvSteps.vue        |  2 +-
 src/views/Suppression/SuppSteps.vue           | 60 +++++++++++++++++++
 5 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/src/components/Dialog/DialogLancerTraitement.vue b/src/components/Dialog/DialogLancerTraitement.vue
index 53ac46b..89dc07e 100644
--- a/src/components/Dialog/DialogLancerTraitement.vue
+++ b/src/components/Dialog/DialogLancerTraitement.vue
@@ -15,7 +15,7 @@
         <v-card-actions class="justify-space-between">
           <v-btn v-if="!isFinished" color="primary" @click="dialog = false" aria-label="Annuler">Annuler</v-btn>
           <v-spacer v-else></v-spacer>
-          <v-btn v-if="!isFinished" color="primary" @click="confirm()" aria-label="Valider">Valider</v-btn>
+          <v-btn v-if="!isFinished && !isSuppDemande" color="primary" @click="confirm()" aria-label="Valider">Valider</v-btn>
           <v-btn v-else color="primary" @click="router.push(route)" aria-label="OK">OK</v-btn>
         </v-card-actions>
       </v-card>
@@ -36,6 +36,10 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  rubrique: {
+    required: true,
+    type: String,
+  },
   route: {
     required: true,
     type: String,
@@ -47,7 +51,7 @@ const isFinished = ref(false);
 function confirm() {
   emits('launch');
   title.value = "Traitement validé";
-  body.value = "Votre demande est en cours de traitement.<br/>Un mail vous sera envoyé quand celui-ci sera terminé.<br/>Vous pouvez retrouver l'ensemble de vos demandes sur votre tableau de bord ITEM. Rubrique \"Gérer mes créations\".";
+  body.value = `Votre demande est en cours de traitement.<br/>Un mail vous sera envoyé quand celui-ci sera terminé.<br/>Vous pouvez retrouver l'ensemble de vos demandes sur votre tableau de bord ITEM. Rubrique ${props.rubrique}.`;
   isFinished.value = true;
 }
 </script>
diff --git a/src/views/Exemplarisation/ExempSteps.vue b/src/views/Exemplarisation/ExempSteps.vue
index 33f30d2..ebb50fc 100644
--- a/src/views/Exemplarisation/ExempSteps.vue
+++ b/src/views/Exemplarisation/ExempSteps.vue
@@ -97,7 +97,7 @@
       </v-col>
     </v-row>
   </v-container>
-  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" route="/exemplarisation-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
+  <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>
 
diff --git a/src/views/Modification/ModifSteps.vue b/src/views/Modification/ModifSteps.vue
index decabff..3bb2028 100644
--- a/src/views/Modification/ModifSteps.vue
+++ b/src/views/Modification/ModifSteps.vue
@@ -146,7 +146,7 @@
       </v-col>
     </v-row>
   </v-container>
-  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" 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>
 
diff --git a/src/views/Recouvrement/RecouvSteps.vue b/src/views/Recouvrement/RecouvSteps.vue
index ec3813c..5bf0716 100644
--- a/src/views/Recouvrement/RecouvSteps.vue
+++ b/src/views/Recouvrement/RecouvSteps.vue
@@ -75,7 +75,7 @@
             <v-divider></v-divider>
             <v-card-actions>
               <v-spacer></v-spacer>
-              <v-btn color="primary" @click="router.replace('recouvrement-tableau')" aria-label="OK">OK</v-btn>
+              <v-btn color="primary" @click="router.push('recouvrement-tableau')" aria-label="OK">OK</v-btn>
             </v-card-actions>
           </v-card>
         </v-dialog>
diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue
index a12c453..870fe45 100644
--- a/src/views/Suppression/SuppSteps.vue
+++ b/src/views/Suppression/SuppSteps.vue
@@ -92,12 +92,50 @@
               </v-container>
             </v-stepper-window-item>
             <v-stepper-window-item>
+              <select-file v-model="fileFinalSelected" :is-loading="isLoading" @deleted="deleteDemande()">Charger le
+                fichier des exemplaires à supprimer
+              </select-file>
+              <v-alert
+                v-if="alertMessage"
+                :type="alertType"
+              >
+                <span v-html="alertMessage"></span>
+              </v-alert>
+              <v-container class="d-flex justify-space-between">
+                <v-btn @click="prev">
+                  précédent
+                </v-btn>
+                <v-btn
+                  :disabled="!fileFinalSelected"
+                  @click="uploadFileFinal()"
+                >
+                  Lancer le traitement en production
+                </v-btn>
+              </v-container>
             </v-stepper-window-item>
             <v-stepper-window-item>
 
             </v-stepper-window-item>
           </v-stepper-window>
         </v-stepper>
+        <v-dialog
+          v-model="dialog"
+          width="500"
+        >
+          <v-card>
+            <v-card-title class="headline" primary-title>Traitement validé</v-card-title>
+            <v-card-text>Votre demande est en cours de traitement.<br/>Un mail vous sera envoyé quand celui-ci sera
+              terminé.
+              <br>Vous pouvez retrouver l'ensemble de vos demandes sur votre tableau de bord ITEM. Rubrique "Gérer mes
+              suppressions".
+            </v-card-text>
+            <v-divider></v-divider>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn color="primary" @click="router.push('suppression-tableau')" aria-label="OK">OK</v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-dialog>
       </v-col>
     </v-row>
   </v-container>
@@ -110,6 +148,8 @@ import SelectFile from '@/components/SelectFile.vue';
 import demandesService from '@/service/DemandesService';
 import {tr} from "vuetify/locale";
 import DownloadFile from "@/components/Modif/DownloadFile.vue";
+import router from '@/router'
+import DialogLancerTraitement from '@/components/Dialog/DialogLancerTraitement.vue'
 
 
 
@@ -122,6 +162,7 @@ const props = defineProps({id: {type: String}});
 
 const rcrSelected = ref();
 const typeFileSelected = ref();
+const fileFinalSelected = ref();
 const fileSelected = ref();
 const fileLink = ref('');
 const fileName = ref('');
@@ -130,6 +171,7 @@ const isDownloaded = ref(false);
 const isLoading = ref(false);
 const alertMessage = ref('');
 const alertType = ref('success');
+const dialog = ref(false);
 
 
 function createDemande() {
@@ -203,6 +245,24 @@ function changeEtape() {
   }
 }
 
+function uploadFileFinal() {
+  alertMessage.value = '';
+  alertType.value = 'success';
+  isLoading.value = true;
+  demandesService.uploadDemande(demande.value.id, fileFinalSelected.value, 'SUPP')
+    .then(() => {
+      alertMessage.value = "Fichier envoyé";
+      dialog.value = true;
+    })
+    .catch(err => {
+      alertMessage.value = err.response.data.message;
+      alertType.value = 'error';
+    })
+    .finally(() => {
+      isLoading.value = false;
+    });
+}
+
 function prevSelectTypeFile(){
   typeFileSelected.value = null;
   changeEtape()

From 35a900f3bf208678ee970585afd7e9261e003ba8 Mon Sep 17 00:00:00 2001
From: SamuelQuetin <samquetinuel@gmail.com>
Date: Wed, 21 Aug 2024 14:24:31 +0200
Subject: [PATCH 2/2] FIX supp du step SIMU FEAT Ajout gestion isLoading

---
 src/views/Suppression/SuppSteps.vue | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue
index 870fe45..76a2a47 100644
--- a/src/views/Suppression/SuppSteps.vue
+++ b/src/views/Suppression/SuppSteps.vue
@@ -25,21 +25,14 @@
             </v-stepper-item>
             <v-divider></v-divider>
             <v-stepper-item
-              :color="currentStep >= 3 ? '#295494' : ''"
-              :complete="currentStep > 3"
+              :color="currentStep >= 2 ? '#295494' : ''"
+              :complete="currentStep > 2"
               editable
-              icon="mdi-numeric-4"
+              icon="mdi-numeric-3"
               title="Envoi"
               subtitle="du fichier"
             >
             </v-stepper-item>
-            <v-divider></v-divider>
-            <v-stepper-item
-              :color="currentStep >= 4 ? '#295494' : ''"
-              icon="mdi-numeric-5"
-              title="Simulation"
-            >
-            </v-stepper-item>
           </v-stepper-header>
 
           <v-stepper-window>
@@ -49,6 +42,7 @@
                 <v-spacer></v-spacer>
                 <v-btn
                   :disabled="!rcrSelected"
+                  :loading="isLoading"
                   @click="createDemande"
                 >
                   Valider
@@ -57,7 +51,7 @@
             </v-stepper-window-item>
             <v-stepper-window-item>
               <type-file v-if="!typeFileSelected" v-model="typeFileSelected" @clicked="setTypeSelected()"></type-file>
-              <select-file v-else-if="!isLoaded" v-model="fileSelected" :typeFile="typeFileSelected">Selection du fichier {{typeFileSelected}}</select-file>
+              <select-file v-else-if="!isLoaded" :is-loading="isLoading" v-model="fileSelected" :typeFile="typeFileSelected">Selection du fichier {{typeFileSelected}}</select-file>
               <download-file v-if="isLoaded" :file-link="fileLink" :file-name="fileName" @clicked="isDownloaded = true">Téléchargement du fichier PPN/RCR/EPN</download-file>
               <v-alert
                 v-if="alertMessage"
@@ -78,6 +72,7 @@
                 <v-btn
                   v-if="typeFileSelected && !isLoaded"
                   :disabled="!fileSelected"
+                  :loading="isLoading"
                   @click="uploadFile()"
                 >
                   Envoyer
@@ -108,14 +103,12 @@
                 <v-btn
                   :disabled="!fileFinalSelected"
                   @click="uploadFileFinal()"
+                  :loading="isLoading"
                 >
                   Lancer le traitement en production
                 </v-btn>
               </v-container>
             </v-stepper-window-item>
-            <v-stepper-window-item>
-
-            </v-stepper-window-item>
           </v-stepper-window>
         </v-stepper>
         <v-dialog
@@ -142,14 +135,13 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 import TypeFile from '@/components/Supp/TypeFile.vue';
 import SelectFile from '@/components/SelectFile.vue';
 import demandesService from '@/service/DemandesService';
-import {tr} from "vuetify/locale";
 import DownloadFile from "@/components/Modif/DownloadFile.vue";
 import router from '@/router'
-import DialogLancerTraitement from '@/components/Dialog/DialogLancerTraitement.vue'
+import Rcr from '@/components/Rcr.vue';