From ffd4f57c9936d692c711be42f92e00ac0fdb412a Mon Sep 17 00:00:00 2001
From: "joel.clement"
Date: Mon, 7 Jun 2021 09:49:37 +0200
Subject: [PATCH] chasse
---
frontend/src/components/form/chained-form.vue | 34 ++++++++++---------
frontend/src/components/form/generic-form.vue | 2 ++
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/frontend/src/components/form/chained-form.vue b/frontend/src/components/form/chained-form.vue
index 6d31139a..87b382c0 100644
--- a/frontend/src/components/form/chained-form.vue
+++ b/frontend/src/components/form/chained-form.vue
@@ -9,9 +9,12 @@
-
@@ -39,14 +42,14 @@ export default {
components: {
filArianne,
help,
- genericForm,
+ genericForm
},
data: () => ({
declaration: null,
validForms: {},
initialized: false,
- freeze: null,
+ freeze: null
}),
computed: {
@@ -65,7 +68,7 @@ export default {
// retourne la clé de session courrante
keySession() {
return this.$route.query.keySession || this.firstSession;
- },
+ }
},
methods: {
@@ -80,7 +83,6 @@ export default {
// si c'est la dernière session validation = requete
if (sessionFunctions.lastSession(this.config) == keySession) {
-
sessionDef.action = this.config.action;
// sinon on passe au formulaire suivant
@@ -89,7 +91,7 @@ export default {
sessionDef.action = {
label: "Suivant",
process: ({ $router, config }) => {
- return new Promise((resolve) => {
+ return new Promise(resolve => {
const nextSession = sessionFunctions.nextSession(
config,
config.keySession
@@ -98,11 +100,11 @@ export default {
// ici indispensable sinon bug et valide à l'avant dernière !!!!!
setTimeout(() => {
$router.push({ query: { keySession: nextSession } });
- }, 200)
+ }, 200);
}
resolve();
});
- },
+ }
};
}
}
@@ -119,7 +121,7 @@ export default {
.preloadData({
$store: this.$store,
id: this.id,
- config: this.config,
+ config: this.config
})
.then(() => {
this.initialized = true;
@@ -129,20 +131,20 @@ export default {
}
},
- showSession: function (keySession) {
+ showSession: function(keySession) {
return this.keySession === "all" || this.keySession == keySession;
},
- showGroupSession: function (keySessionGroup) {
+ showGroupSession: function(keySessionGroup) {
return (
this.keySession === "all" ||
this.keySession in this.config.sessionGroups[keySessionGroup].sessions
);
- },
+ }
},
- created: function () {
+ created: function() {
this.initChainedForm();
- },
+ }
};
diff --git a/frontend/src/components/form/generic-form.vue b/frontend/src/components/form/generic-form.vue
index aad9d189..cce541e1 100644
--- a/frontend/src/components/form/generic-form.vue
+++ b/frontend/src/components/form/generic-form.vue
@@ -18,6 +18,7 @@
champs obligatoires.
+
{{ config.action.label || "Valider" }}
+