Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 15:13:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

merge 2 subcomponent to use only Entity/PersonRenderBox.vue

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-08-27 15:36:38 +02:00
parent d4430246f7
commit 4f6011348d
11 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
View File

@@ -25,7 +25,7 @@
<div class="item-row">
<div class="item-col">
<div>
<person :person="conc.person"></person>
<person-render-box render="badge" :person="conc.person"></person-render-box>
</div>
<div v-if="conc.person.birthdate !== null">
{{ $t('person.born', {'gender': conc.person.gender} ) }}
@@ -126,7 +126,7 @@ div.person {
<script>
import { mapGetters } from 'vuex';
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
import MemberDetails from './MemberDetails.vue';
import { ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
@@ -135,7 +135,7 @@ export default {
components: {
AddPersons,
MemberDetails,
Person,
PersonRenderBox,
},
computed: {
...mapGetters([

6
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
View File

@@ -3,7 +3,7 @@
<div class="item-row">
<div class="item-col">
<div>
<person :person="conc.person"></person>
<person-render-box render="badge" :person="conc.person"></person-render-box>
<span v-if="isHolder" class="badge bg-primary holder">
{{ $t('household_members_editor.holder') }}
</span>
@@ -73,14 +73,14 @@ div.participation-details {
<script>
import { mapGetters } from 'vuex';
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
import CKEditor from '@ckeditor/ckeditor5-vue';
import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
export default {
name: 'MemberDetails',
components: {
Person,
PersonRenderBox,
ckeditor: CKEditor.component,
},
props: [