From 74a9fadc805beeca71e4df3a094a0825c975cde5 Mon Sep 17 00:00:00 2001 From: EryneKL <97091460+EryneKL@users.noreply.github.com> Date: Fri, 18 Oct 2024 09:42:41 +0200 Subject: [PATCH 1/6] FIX ITEM-305-front-envoi-dun-fichier-epn-catcher-le-message-derreur-du-back-dans-le-cas-dun-fichier-de-correspondance-contenant-une-ligne-en-erreur --- src/views/Suppression/SuppSteps.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index e0f9406..525d818 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -298,10 +298,18 @@ 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'; + }) }) .catch(err => { alertMessage.value = err.response.data.message; From 6703dd12b953ea7d49c838053ad663b5aeb4c4a6 Mon Sep 17 00:00:00 2001 From: SamuelQuetin Date: Fri, 18 Oct 2024 15:55:13 +0200 Subject: [PATCH 2/6] Fix actualisation pas bonne page si EPN Fix gestion isLoading --- src/views/Suppression/SuppSteps.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index 525d818..72549f8 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -186,6 +186,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': @@ -310,11 +313,17 @@ function uploadFileFinal() { 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; + }); } } From 5adb74ce8f1b9d45cc892e380b0e90782f570a3c Mon Sep 17 00:00:00 2001 From: EryneKL <97091460+EryneKL@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:00:28 +0200 Subject: [PATCH 3/6] FIX ITEM-305-front-envoi-dun-fichier-epn-catcher-le-message-derreur-du-back-dans-le-cas-dun-fichier-de-correspondance-contenant-une-ligne-en-erreur --- src/views/Suppression/SuppSteps.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index 525d818..bd39d2d 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -312,6 +312,8 @@ function uploadFileFinal() { }) }) .catch(err => { + isLoading.value = false; + fileSelected.value = null; alertMessage.value = err.response.data.message; alertType.value = 'error'; }) From abb23436a25d5e6e3bc8c68d6fd196fa03779818 Mon Sep 17 00:00:00 2001 From: EryneKL <97091460+EryneKL@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:12:51 +0200 Subject: [PATCH 4/6] FIX ITEM-305-front-envoi-dun-fichier-epn-catcher-le-message-derreur-du-back-dans-le-cas-dun-fichier-de-correspondance-contenant-une-ligne-en-erreur --- src/views/Suppression/SuppSteps.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index 9de2562..66fa424 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -65,6 +65,7 @@ @@ -104,6 +105,7 @@ @@ -318,7 +320,6 @@ function uploadFileFinal() { }); }) .catch(err => { - isLoading.value = false; fileSelected.value = null; alertMessage.value = err.response.data.message; alertType.value = 'error'; From 63023c40e605631bc2f6e4e094633d3f9479c5e5 Mon Sep 17 00:00:00 2001 From: EryneKL <97091460+EryneKL@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:46:02 +0200 Subject: [PATCH 5/6] FIX ITEM-305-front-envoi-dun-fichier-epn-catcher-le-message-derreur-du-back-dans-le-cas-dun-fichier-de-correspondance-contenant-une-ligne-en-erreur --- src/views/Suppression/SuppSteps.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index 66fa424..a8275f8 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -320,7 +320,6 @@ function uploadFileFinal() { }); }) .catch(err => { - fileSelected.value = null; alertMessage.value = err.response.data.message; alertType.value = 'error'; }) From 75eb3e1a0f7333452f62a9cd90a2c94bfff44c71 Mon Sep 17 00:00:00 2001 From: EryneKL <97091460+EryneKL@users.noreply.github.com> Date: Thu, 24 Oct 2024 09:40:32 +0200 Subject: [PATCH 6/6] FIX ITEM-313-front-changer-lintitule-dans-recap-demande : - modification d'un texte dans RecapDemande.vue --- src/components/RecapDemande.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/RecapDemande.vue b/src/components/RecapDemande.vue index 00fc6c7..bafc550 100644 --- a/src/components/RecapDemande.vue +++ b/src/components/RecapDemande.vue @@ -9,7 +9,7 @@ {{ demande.id }} - Date de modification + Date du traitement {{ demande.dateModification }} @@ -31,7 +31,7 @@