complete previous commit (+dirty auto corrections from IDE)

This commit is contained in:
2021-07-23 15:19:57 +02:00
parent 8384508c1a
commit b0ef9b6612
16 changed files with 66 additions and 241 deletions

View File

@@ -48,10 +48,10 @@
<p class="move_hint">{{ $t('household_members_editor.concerned.move_to') }}:</p>
<template
v-for="position in positions"
v-for="position in positions"
>
<button
<button
class="btn btn-outline-primary"
@click="moveToPosition(conc.person.id, position.id)"
>
@@ -82,7 +82,7 @@
<div v-if="needsPositionning" class="positions">
<div
<div
v-for="position in positions"
>
<h3>{{ position.label.fr }}</h3>
@@ -128,7 +128,7 @@ import { mapGetters } from 'vuex';
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
import MemberDetails from './MemberDetails.vue';
import { ISOToDatetime } from 'ChillMainAssets/js/date.js';
import { ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
export default {
name: 'Concerned',

View File

@@ -75,7 +75,7 @@ div.participation-details {
import { mapGetters } from 'vuex';
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
import CKEditor from '@ckeditor/ckeditor5-vue';
import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
export default {
name: 'MemberDetails',
@@ -112,7 +112,7 @@ export default {
},
methods: {
toggleHolder() {
this.$store.dispatch('toggleHolder', this.conc);
this.$store.dispatch('toggleHolder', this.conc);
},
removePosition() {
this.$store.dispatch('removePosition', this.conc);

View File

@@ -1,6 +1,6 @@
import { createStore } from 'vuex';
import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod } from './../api.js';
import { datetimeToISO } from 'ChillMainAssets/js/date.js';
import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
const debug = process.env.NODE_ENV !== 'production';
@@ -72,7 +72,7 @@ const store = createStore({
return getters.needsPositionning === false
|| (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
},
persons(state) {
persons(state) {
return state.concerned.map(conc => conc.person);
},
concUnpositionned(state) {
@@ -85,7 +85,7 @@ const store = createStore({
},
personByPosition: (state) => (position_id) => {
return state.concerned
.filter(conc =>
.filter(conc =>
conc.position !== null ? conc.position.id === position_id : false
)
.map(conc => conc.person)
@@ -93,7 +93,7 @@ const store = createStore({
},
concByPosition: (state) => (position_id) => {
return state.concerned
.filter(conc =>
.filter(conc =>
conc.position !== null ? conc.position.id === position_id : false
)
;
@@ -117,7 +117,7 @@ const store = createStore({
;
if (state.forceLeaveWithoutHousehold === false) {
payload.destination = {
payload.destination = {
id: state.household.id,
type: state.household.type
};
@@ -154,9 +154,9 @@ const store = createStore({
addConcerned(state, person) {
let persons = state.concerned.map(conc => conc.person.id);
if (!persons.includes(person.id)) {
state.concerned.push({
state.concerned.push({
person,
position: null,
position: null,
allowRemove: true,
holder: false,
comment: "",
@@ -182,7 +182,7 @@ const store = createStore({
conc.position = null;
},
removeConcerned(state, conc) {
state.concerned = state.concerned.filter(c =>
state.concerned = state.concerned.filter(c =>
c.person.id !== conc.person.id
)
},
@@ -309,7 +309,7 @@ const store = createStore({
error = household;
for (let i in error.violations) {
let e = error.violations[i];
errors.push(e.title);
errors.push(e.title);
}
commit('setErrors', errors);