diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts index b024c1a55..331522e05 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts @@ -169,6 +169,9 @@ export interface TicketFilters { export interface TicketFilterParams { byPerson?: number[]; + byCreator?: number[]; + byAddressee?: number[]; + byAddresseeGroup?: number[]; byCurrentState?: TicketState[]; byCurrentStateEmergency?: TicketEmergencyState[]; byMotives?: number[]; diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue index 2415c5af1..074e3b7c1 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue @@ -7,7 +7,7 @@ :multiple="true" :removable-if-set="true" :display-picked="true" - :label="trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)" + :label="label" @add-new-entity="addNewEntity" @remove-entity="removeEntity" /> @@ -28,10 +28,16 @@ import { trans, } from "translator"; -const props = defineProps<{ - modelValue: Entities[]; - suggested: Entities[]; -}>(); +const props = withDefaults( + defineProps<{ + modelValue: Entities[]; + suggested: Entities[]; + label?: string; + }>(), + { + label: trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL), + }, +); const emit = defineEmits<(e: "update:modelValue", value: Entities[]) => void>(); diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue index 1f4cfd891..2a886dfd5 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue @@ -101,6 +101,7 @@ onMounted(async () => { await store.dispatch("getCurrentUser"); await store.dispatch("fetchTicketList", filters); await store.dispatch("fetchMotives"); + await store.dispatch("fetchUserGroups"); } finally { isLoading.value = false; } diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue index d60e620e9..0b9f055ff 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue @@ -23,6 +23,31 @@ /> +
+ + +
+ +
+ + +
@@ -193,8 +218,10 @@