From 0b555c6021b30ca818f8acc449611a05f1fe365e Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Mon, 16 Sep 2024 15:49:35 +0200 Subject: [PATCH 1/4] =?UTF-8?q?-=20Ajout=20des=20liens=20et=20redirection?= =?UTF-8?q?=20vers=20les=20=C3=A9l=C3=A9ments=20de=20suppression=20=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Structure/Navbar.vue | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/components/Structure/Navbar.vue b/src/components/Structure/Navbar.vue index fe7e1bf..bb23a77 100644 --- a/src/components/Structure/Navbar.vue +++ b/src/components/Structure/Navbar.vue @@ -104,6 +104,30 @@ + + + + + + Suppressions + + + + + Supprimer des exemplaires + + + + + Tableau des
suppressions d'exemplaires
+
+ +
+ @@ -168,4 +192,9 @@ de l'ILN ${user.iln}` p { white-space: pre-line; } +.custom-list-item { + min-height: 24px; + display: flex; + align-items: center; +} From f9bfc3c74ebcc592b3b8fff6c66e117523f76c6a Mon Sep 17 00:00:00 2001 From: EryneKL <97091460+EryneKL@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:31:07 +0200 Subject: [PATCH 2/4] REFACTOR ITEM-216-front-modifier-menu-hamburger : - adaptation du padding dans les titres de menu --- src/components/Structure/Navbar.vue | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/Structure/Navbar.vue b/src/components/Structure/Navbar.vue index bb23a77..a6918bb 100644 --- a/src/components/Structure/Navbar.vue +++ b/src/components/Structure/Navbar.vue @@ -40,7 +40,7 @@ - Recouvrement + Recouvrement @@ -63,7 +63,7 @@ - Creations + Creations @@ -86,7 +86,7 @@ - Modifications + Modifications @@ -109,7 +109,7 @@ - Suppressions + Suppressions @@ -192,9 +192,4 @@ de l'ILN ${user.iln}` p { white-space: pre-line; } -.custom-list-item { - min-height: 24px; - display: flex; - align-items: center; -} From 79d34c329527961253a2c29c5b94eda40fcdbf5c Mon Sep 17 00:00:00 2001 From: SamuelQuetin Date: Tue, 17 Sep 2024 15:49:04 +0200 Subject: [PATCH 3/4] FEAT ajout de props dans le dialog + utilisation pour supp --- src/components/Dialog/DialogLancerTraitement.vue | 15 +++++++++++++-- src/views/Suppression/SuppSteps.vue | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/Dialog/DialogLancerTraitement.vue b/src/components/Dialog/DialogLancerTraitement.vue index 89dc07e..b1b00bb 100644 --- a/src/components/Dialog/DialogLancerTraitement.vue +++ b/src/components/Dialog/DialogLancerTraitement.vue @@ -43,11 +43,22 @@ const props = defineProps({ route: { required: true, type: String, + }, + title: { + required: false, + type: String, + default: 'Lancement du traitement en production' + }, + body: { + required: false, + type: String, + default: 'Êtes-vous sûr de vouloir lancer le traitement en production ?
Aucune annulation n\'est possible.' } }) -const title = ref('Lancement du traitement en production'); -const body = ref('Êtes-vous sûr de vouloir lancer le traitement en production ?
Aucune annulation n\'est possible.'); +const title = ref(props.title); +const body = ref(props.body); const isFinished = ref(false); + function confirm() { emits('launch'); title.value = "Traitement validé"; diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index 93c43ff..597fa05 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -131,7 +131,7 @@ - + From 09499df9848811fd7d2b795cd4041a022aa2cc57 Mon Sep 17 00:00:00 2001 From: SamuelQuetin Date: Wed, 18 Sep 2024 08:13:10 +0200 Subject: [PATCH 4/4] fix change etat apres simu --- src/views/Suppression/SuppSteps.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index 93c43ff..c2827dd 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -272,6 +272,12 @@ function changeEtape() { demande.value = response.data; }); } + if ((currentStep.value + 1) === 3 ) { + itemService.choixEtape(demande.value.id, 3, 'SUPP') + .then(response => { + demande.value = response.data; + }); + } } function uploadFileFinal() {