diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue index 3d246d5f2..b92f47319 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue @@ -12,13 +12,20 @@ >{{ trans(USER_CURRENT_USER) }} {{ p.text }} + + Ménage n°{{ p.id }} + @@ -75,7 +85,7 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue"; import { Entities, EntitiesOrMe, - EntityType, + EntityType, isEntityHousehold, SearchOptions, Suggestion, } from "ChillPersonAssets/types"; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts index eb36d6bd7..6241b4b50 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts +++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts @@ -392,6 +392,10 @@ export type EntityType = export type Entities = (UserGroup | User | Person | Thirdparty | Household); +export function isEntityHousehold(e: Entities): e is Household { + return e.type === "household"; +} + export type EntitiesOrMe = "me" | Entities; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue index 1d1568813..9daf3219f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue @@ -1,11 +1,11 @@ @@ -22,11 +22,6 @@ interface TypeUserProps { const props = defineProps(); -const hasParent = computed(() => props.item.result.parent !== null); - -defineExpose({ - hasParent, -});