mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-13 13:54:23 +00:00
hop
This commit is contained in:
parent
c258179017
commit
d4430246f7
@ -96,11 +96,10 @@
|
|||||||
<div class="householdSuggestions">
|
<div class="householdSuggestions">
|
||||||
<div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
|
<div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
|
||||||
<p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
|
<p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
|
||||||
<div class="householdSuggestionList">
|
<div class="flex-table householdSuggestionList">
|
||||||
<div
|
<div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
|
||||||
v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
|
class="item-bloc">
|
||||||
class="item"
|
|
||||||
>
|
|
||||||
<household-render-box :household="h"></household-render-box>
|
<household-render-box :household="h"></household-render-box>
|
||||||
|
|
||||||
<ul class="record_actions">
|
<ul class="record_actions">
|
||||||
@ -117,43 +116,7 @@
|
|||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
|
|
||||||
div.householdAddressSuggestionList {
|
|
||||||
/*
|
|
||||||
display: flex;
|
|
||||||
list-style-type: none;
|
|
||||||
padding: 0;
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
& > li {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.householdSuggestionList {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
justify-content: space-between;
|
|
||||||
|
|
||||||
& > .item {
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
width: calc(50% - 1rem);
|
|
||||||
border: 1px solid var(--chill-light-gray);
|
|
||||||
padding: 0.5rem 0.5rem 0 0.5rem;
|
|
||||||
|
|
||||||
ul.record_actions {
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
import { mapGetters, mapState } from 'vuex';
|
import { mapGetters, mapState } from 'vuex';
|
||||||
import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
|
import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
|
||||||
import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
|
import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
|
||||||
@ -272,3 +235,29 @@ export default {
|
|||||||
};
|
};
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
/*
|
||||||
|
div.householdAddressSuggestionList {
|
||||||
|
display: flex;
|
||||||
|
list-style-type: none;
|
||||||
|
padding: 0;
|
||||||
|
& > li {}
|
||||||
|
}
|
||||||
|
.householdSuggestionList {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: space-between;
|
||||||
|
& > .item {
|
||||||
|
margin-bottom: 0.8rem;
|
||||||
|
width: calc(50% - 1rem);
|
||||||
|
border: 1px solid var(--chill-light-gray);
|
||||||
|
padding: 0.5rem 0.5rem 0 0.5rem;
|
||||||
|
ul.record_actions {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
</style>
|
||||||
|
@ -1,71 +1,56 @@
|
|||||||
<template>A
|
<template>
|
||||||
<section class="chill-entity entity-household">
|
<section class="chill-entity entity-household">
|
||||||
<!-- identifier -->
|
<div class="item-row">
|
||||||
<div v-if="isHouseholdNew()" class="identifier">
|
<div class="item-col">
|
||||||
<i class="fa fa-home"></i>
|
|
||||||
{{ $t('new_household') }}
|
|
||||||
</div>
|
|
||||||
<div v-else class="identifier">
|
|
||||||
<i class="fa fa-home"></i>
|
|
||||||
{{ $t('household_number', { number: household.id } ) }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- member part -->
|
<!-- identifier -->
|
||||||
<div v-if="hasCurrentMembers" class="members">
|
<div v-if="isHouseholdNew()" class="identifier">
|
||||||
<span class="current-members">{{ $t('current_members') }}: </span>
|
<i class="fa fa-home"></i>
|
||||||
<template v-for="(m, index) in currentMembers()" :key="m.id">
|
{{ $t('new_household') }}
|
||||||
<person :person="m.person"></person>
|
</div>
|
||||||
<span v-if="m.holder">
|
<div v-else class="identifier">
|
||||||
<span class="badge bg-primary">{{ $t('holder') }}</span>
|
<i class="fa fa-home"></i>
|
||||||
</span>
|
{{ $t('household_number', { number: household.id } ) }}
|
||||||
<span v-if="index != (currentMembersLength() - 1)">, </span>
|
</div>
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
<div v-else class="members">
|
|
||||||
<p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- address part -->
|
</div>
|
||||||
<div v-if="hasAddress()" class="where">
|
<div class="item-col">
|
||||||
<i class="fa fa-where"></i>
|
<ul class="list-content fa-ul">
|
||||||
<show-address :address="household.current_address"></show-address>
|
|
||||||
</div>
|
<!-- member part -->
|
||||||
<div v-else class="where">
|
<li v-if="hasCurrentMembers" class="members">
|
||||||
<i class="fa fa-where"></i>
|
<i class="fa fa-li fa-user" :title="$t('current_members')"></i>
|
||||||
<p class="chill-no-data-statement">{{ $t('no_current_address') }}</p>
|
<template v-for="(m, index) in currentMembers()" :key="m.id">
|
||||||
</div>
|
<person :person="m.person"></person>
|
||||||
</section>B
|
<span v-if="m.holder">
|
||||||
|
<span class="badge bg-primary">{{ $t('holder') }}</span>
|
||||||
|
</span>
|
||||||
|
<span v-if="index != (currentMembersLength() - 1)">, </span>
|
||||||
|
</template>
|
||||||
|
</li>
|
||||||
|
<li v-else class="members">
|
||||||
|
<i class="fa fa-li fa-user" :title="$t('current_members')"></i>
|
||||||
|
<p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<!-- address part -->
|
||||||
|
<li v-if="hasAddress()" class="where">
|
||||||
|
<i class="fa fa-li fa-map-marker"></i>
|
||||||
|
<show-address :address="household.current_address"></show-address>
|
||||||
|
</li>
|
||||||
|
<li v-else class="where">
|
||||||
|
<i class="fa fa-li fa-map-marker"></i>
|
||||||
|
<p class="chill-no-data-statement">{{ $t('no_current_address') }}</p>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
section.chill-entity {
|
|
||||||
&.entity-household {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: auto auto 30%;
|
|
||||||
grid-template-areas:
|
|
||||||
"iden iden where"
|
|
||||||
"who who where";
|
|
||||||
.identifier {
|
|
||||||
grid-area: iden;
|
|
||||||
font-size: 1.3em;
|
|
||||||
font-weight: 700;
|
|
||||||
color: var(--chill-blue);
|
|
||||||
}
|
|
||||||
.members {
|
|
||||||
grid-area: who;
|
|
||||||
.current-members {
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.where {
|
|
||||||
grid-area: where
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
|
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
|
||||||
import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
|
import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
|
||||||
|
|
||||||
@ -82,8 +67,7 @@ const i18n = {
|
|||||||
"holder": "titulaire",
|
"holder": "titulaire",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
;
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Household',
|
name: 'Household',
|
||||||
@ -126,5 +110,33 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
section.chill-entity {
|
||||||
|
&.entity-household {
|
||||||
|
.identifier {
|
||||||
|
//grid-area: iden;
|
||||||
|
font-size: 1.3em;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--chill-blue);
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto auto 30%;
|
||||||
|
grid-template-areas:
|
||||||
|
"iden iden where"
|
||||||
|
"who who where";
|
||||||
|
.members {
|
||||||
|
//grid-area: who;
|
||||||
|
.current-members {
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.where {
|
||||||
|
//grid-area: where
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user