merge 2 subcomponent to use only Entity/PersonRenderBox.vue

This commit is contained in:
2021-08-27 15:36:38 +02:00
parent d4430246f7
commit 4f6011348d
11 changed files with 27 additions and 38 deletions

View File

@@ -21,11 +21,15 @@
<li v-if="hasCurrentMembers" class="members">
<i class="fa fa-li fa-user" :title="$t('current_members')"></i>
<template v-for="(m, index) in currentMembers()" :key="m.id">
<person :person="m.person"></person>
<span v-if="m.holder">
&nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
</span>
<span v-if="index != (currentMembersLength() - 1)">, </span>
<person-render-box render="badge"
:person="m.person"
:options="{
}">
</person-render-box>
</template>
</li>
<li v-else class="members">
@@ -51,7 +55,7 @@
</template>
<script>
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
const i18n = {
@@ -73,7 +77,7 @@ export default {
name: 'Household',
props: ['household'],
components: {
Person,
PersonRenderBox,
ShowAddress,
},
i18n,

View File

@@ -1,5 +1,6 @@
<template>
<div class="item-bloc">
<div v-if="render === 'bloc'"
class="item-bloc">
<section class="chill-entity entity-person">
<div class="item-row entity-bloc">
@@ -86,7 +87,7 @@
</div>
</section>
</div>
</div>
</template>
<script>
@@ -98,7 +99,7 @@ export default {
components: {
ShowAddress
},
props: ['person', 'options'],
props: ['person', 'options', 'render'],
computed: {
getGender: function() {
return this.person.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';