From 3d65bb996d193937c0e51f5efdf0e20db6f22abc Mon Sep 17 00:00:00 2001 From: Github Action Date: Tue, 10 Sep 2024 12:38:58 +0000 Subject: [PATCH 1/6] Version 3.0.1-SNAPSHOT [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 753f22d..4123e74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Item", - "version": "3.0.0", + "version": "3.0.1-SNAPSHOT", "scripts": { "dev": "vite", "build": "vite build", From 7fb0e6f794980417fcab71acf1ae83a26d410134 Mon Sep 17 00:00:00 2001 From: SamuelQuetin Date: Mon, 16 Sep 2024 09:43:03 +0200 Subject: [PATCH 2/6] fix verification si disable --- src/components/Email.vue | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/components/Email.vue b/src/components/Email.vue index 7cae58e..d274abf 100644 --- a/src/components/Email.vue +++ b/src/components/Email.vue @@ -81,24 +81,26 @@ onMounted(() => { }); function validate() { - if(!props.email){ - itemService.creerEmail(props.userId, emailModel.value) - .then(result => { - emits('validate', result.data.email); - }) - .catch(err => { - messageError.value = err.response.data.message; - throw err; - }); - } else { - itemService.modifierEmail(props.userId, emailModel.value) - .then(result => { - emits('validate', result.data.email); - }) - .catch(err => { - messageError.value = err.response.data.message; - throw err; - }); + if(!isDisabled) { + if (!props.email) { + itemService.creerEmail(props.userId, emailModel.value) + .then(result => { + emits('validate', result.data.email); + }) + .catch(err => { + messageError.value = err.response.data.message; + throw err; + }); + } else { + itemService.modifierEmail(props.userId, emailModel.value) + .then(result => { + emits('validate', result.data.email); + }) + .catch(err => { + messageError.value = err.response.data.message; + throw err; + }); + } } } From 0a860f3a363635c0be6f3770f6c9e56c8572fdfe Mon Sep 17 00:00:00 2001 From: SamuelQuetin Date: Mon, 16 Sep 2024 14:47:47 +0200 Subject: [PATCH 3/6] fix submit --- src/components/Email.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/Email.vue b/src/components/Email.vue index d274abf..cd8924b 100644 --- a/src/components/Email.vue +++ b/src/components/Email.vue @@ -5,7 +5,10 @@ Modifier les informations de votre compte - + Votre adresse mail est obligatoire pour utiliser l'application. Pour ajouter plusieurs adresses mail, séparez-les par des points virgules ; @@ -17,7 +20,7 @@ id="email" v-model="emailModel" :rules="rules" - @keyup.enter="validate()"> + > { emailModel.value = props.email; }); -function validate() { - if(!isDisabled) { +async function validate() { + console.log("validate"); + if(!isDisabled.value) { + + console.log("isDisable : " + isDisabled.value); if (!props.email) { + console.log("create mail"); itemService.creerEmail(props.userId, emailModel.value) .then(result => { emits('validate', result.data.email); @@ -92,6 +99,7 @@ function validate() { throw err; }); } else { + console.log("midifact mail"); itemService.modifierEmail(props.userId, emailModel.value) .then(result => { emits('validate', result.data.email); From 9e683480ae03d1c3f4da2a7d8db65b149103a5cd Mon Sep 17 00:00:00 2001 From: EryneKL <97091460+EryneKL@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:32:24 +0200 Subject: [PATCH 4/6] =?UTF-8?q?FEAT=20ITEM-213-front-ajouter-ecran-de-simu?= =?UTF-8?q?lation=20:=20=20=20=20=20=20-=20ajout=20de=20l'=C3=A9cran=20de?= =?UTF-8?q?=20simulation=20dans=20SuppSteps.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Simulation.vue | 4 +-- src/views/Suppression/SuppSteps.vue | 54 +++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/components/Simulation.vue b/src/components/Simulation.vue index b44d60f..cfe89eb 100644 --- a/src/components/Simulation.vue +++ b/src/components/Simulation.vue @@ -53,7 +53,7 @@ import RecapDemande from '@/components/RecapDemande.vue'; import NavigateNotice from '@/components/NavigateNotice.vue'; import { onMounted, ref } from 'vue'; -import demandesService from '@/service/ItemService'; +import itemService from '@/service/ItemService'; const props = defineProps({ demande: { @@ -103,7 +103,7 @@ onMounted(() => { function refresh() { isLoading.value = true; alertMessageError.value = null; - demandesService.simulerLigne(props.demande.id, nbNotice.value.nbNoticeEnCours, props.demande.type) + itemService.simulerLigne(props.demande.id, nbNotice.value.nbNoticeEnCours, props.demande.type) .then(response => { numeroPPNNotice.value = response.data[0]; noticeAvant.value = response.data[1]; diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue index 01dfb33..771aac5 100644 --- a/src/views/Suppression/SuppSteps.vue +++ b/src/views/Suppression/SuppSteps.vue @@ -1,7 +1,7 @@ @@ -161,6 +144,7 @@ import DownloadFile from "@/components/Modif/DownloadFile.vue"; import router from '@/router' import Rcr from '@/components/Rcr.vue'; import Simulation from "@/components/Simulation.vue"; +import DialogLancerTraitement from '@/components/Dialog/DialogLancerTraitement.vue'; import DialogSuppression from '@/components/Dialog/DialogSuppression.vue'; const currentStep = ref(0); @@ -207,12 +191,9 @@ onMounted(()=>{ currentStep.value = 2; break; case 'En simulation': - currentStep.value = 3; rcrSelected.value = demande.value.rcr; - typeDocumentSelected.value = { - id: -1, - libelle: demande.value.typeExemp - }; + typeFileSelected.value = demande.value.typeSuppression; + currentStep.value = 3; break; } }).catch(() => { @@ -339,6 +320,16 @@ function raz(){ isDownloaded.value = false; } +function launchDemande(){ + isLoading.value = true; + itemService.lancerDemande(demande.value.id,'SUPP') + .then(response => { + demande.value = response.data; + }).finally(() => { + isLoading.value = false; + }) +} + function deleteDemande() { suppDialog.value = true; } From 92bd31389e3ad529c885939ad48dd852c041f41f Mon Sep 17 00:00:00 2001 From: SamuelQuetin Date: Tue, 17 Sep 2024 09:43:11 +0200 Subject: [PATCH 6/6] SUPP console.log --- src/components/Email.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/components/Email.vue b/src/components/Email.vue index cd8924b..338754b 100644 --- a/src/components/Email.vue +++ b/src/components/Email.vue @@ -84,12 +84,8 @@ onMounted(() => { }); async function validate() { - console.log("validate"); if(!isDisabled.value) { - - console.log("isDisable : " + isDisabled.value); if (!props.email) { - console.log("create mail"); itemService.creerEmail(props.userId, emailModel.value) .then(result => { emits('validate', result.data.email); @@ -99,7 +95,6 @@ async function validate() { throw err; }); } else { - console.log("midifact mail"); itemService.modifierEmail(props.userId, emailModel.value) .then(result => { emits('validate', result.data.email);