Merge pull request #157 from abes-esr/develop

Develop to main
abes-esr · Oct 25, 2024 · 98f9f4a · 98f9f4a
2 parents 5530de2 + 7ac3554
commit 98f9f4a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/components/RecapDemande.vue b/src/components/RecapDemande.vue
@@ -9,7 +9,7 @@
           <v-row class="d-flex justify-center pa-1">{{ demande.id }}</v-row>
         </v-col>
         <v-col>
-          <v-row class="d-flex justify-center pa-1">Date de modification</v-row>
+          <v-row class="d-flex justify-center pa-1">Date du traitement</v-row>
           <v-row class="d-flex justify-center pa-1">{{ demande.dateModification }}</v-row>
         </v-col>
         <v-col>
@@ -31,7 +31,7 @@
 
 <script setup>
 
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 
 const props = defineProps({
   demande: {type: Object, required: true},

diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue
@@ -65,6 +65,7 @@
                 <v-alert
                   v-if="alertMessage"
                   :type="alertType"
+                  closable
                 >
                   <span v-html="alertMessage"></span>
                 </v-alert>
@@ -104,6 +105,7 @@
                   <v-alert
                     v-if="alertMessage"
                     :type="alertType"
+                    closable
                   >
                     <span v-html="alertMessage"></span>
                   </v-alert>
@@ -186,6 +188,9 @@ onMounted(()=>{
             rcrSelected.value = demande.value.rcr;
             if (demande.value.typeSuppression){
               typeFileSelected.value = demande.value.typeSuppression;
+              if(demande.value.typeSuppression === "EPN"){
+                currentStep.value = 2;
+              }
             }
             break;
           case 'Préparée':
@@ -298,15 +303,29 @@ function uploadFileFinal() {
               .then(() => {
                 goSimulation();
               })
+              .catch(err => {
+                alertMessage.value = err.response.data.message;
+                alertType.value = 'error';
+              })
               .finally(() => {
                 isLoading.value = false;
               });
           })
+          .catch(err => {
+            alertMessage.value = err.response.data.message;
+            alertType.value = 'error';
+          })
+          .finally(() => {
+            isLoading.value = false;
+          });
       })
       .catch(err => {
         alertMessage.value = err.response.data.message;
         alertType.value = 'error';
       })
+      .finally(() => {
+        isLoading.value = false;
+      });
   }
 }