diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 4ab929c02..4f1cb6afd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -140,9 +140,7 @@
-
-
+
@@ -163,7 +161,7 @@
@@ -302,11 +300,12 @@
}
div.objective-title {
+ font-weight: bold;
+ /*
margin-top: 1rem;
font-size: 1.5rem;
- font-weight: bold;
text-align: center;
-
+ */
i.fa {
padding: 0.25rem;
@@ -399,7 +398,8 @@ const i18n = {
no_handling_thirdparty: "Aucun tiers traitant",
precise_handling_thirdparty: "Indiquer un tiers traitant",
choose_a_thirdparty: "Choisir un tiers",
- remove_handling_thirdparty: "Supprimer le tiers traitant",
+ remove_thirdparty: "Enlever le tiers",
+ remove_handling_thirdparty: "Enlever le tiers traitant",
thirdparty_intervener: "Tiers intervenants",
no_thirdparty_intervener: "Aucun tiers intervenant",
add_thirdparties: "Ajouter des tiers",
@@ -430,7 +430,10 @@ export default {
options: {
type: [ 'thirdparty' ],
priority: null,
- uniq: true
+ uniq: true,
+ button: {
+ display: false
+ }
},
},
thirdPartyPicker: {
@@ -439,6 +442,9 @@ export default {
type: [ 'thirdparty' ],
priority: null,
uniq: false,
+ button: {
+ display: false
+ }
},
}
};
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 9cd31e277..42ffb888e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -1,9 +1,8 @@
@@ -19,7 +18,7 @@
-
+
@@ -66,17 +65,17 @@
-
+
-
@@ -150,13 +149,19 @@ export default {
];
let union = [...new Set([
...this.suggested.slice().reverse(),
- ...this.selected.slice().reverse(),
+ ...this.selected.slice().reverse(),
])];
return uniqBy(union, k => k.key);
},
- //options() {
- // return this.options;
- //},
+ getClassButton() {
+ let size = (typeof this.options.button !== 'undefined' && typeof this.options.button.size !== 'undefined') ? this.options.button.size : '';
+ let type = (typeof this.options.button !== 'undefined' && typeof this.options.button.type !== 'undefined') ? this.options.button.type : 'btn-create';
+ return size ? size + ' ' + type : type;
+ },
+ displayTextButton() {
+ return (typeof this.options.button !== 'undefined' && typeof this.options.button.display !== 'undefined') ?
+ this.options.button.display : true;
+ },
checkUniq() {
if (this.options.uniq === true) {
return 'radio';
@@ -184,7 +189,7 @@ export default {
this.loadSuggestions([]);
}
},
- loadSuggestions(suggested) {
+ loadSuggestions(suggested) {
//console.log('suggested', suggested);
this.search.suggested = suggested;
this.search.suggested.forEach(function(item) {
@@ -230,7 +235,7 @@ export default {
margin: auto 4em;
div.search {
position: relative;
- input {
+ input {
width: 100%;
padding: 1.2em 1.5em 1.2em 2.5em;
//margin: 1em 0;
@@ -239,7 +244,7 @@ export default {
position: absolute;
opacity: 0.5;
padding: 0.65em 0;
- top: 50%;
+ top: 50%;
}
i.fa-search {
left: 0.5em;