Skip to content
Snippets Groups Projects
Commit 4b7c7fca authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch...

Merge branch '325-people-with-same-last-name-and-date-of-birth-are-only-shown-one-time-in-absence-dialog' into 'master'

Resolve "People with same last name and date of birth are only shown one time in absence dialog"

Closes #325

See merge request !469
parents f18aa785 ce0953b7
No related branches found
No related tags found
1 merge request!469Resolve "People with same last name and date of birth are only shown one time in absence dialog"
Pipeline #195062 failed
......@@ -4,10 +4,9 @@
<v-row>
<div aria-required="true" class="full-width">
<!-- FIXME Vue 3: clear-on-select -->
<v-autocomplete
<person-field
:gql-query="gqlQuery"
:label="$t('forms.labels.persons')"
:items="allPersons"
item-text="fullName"
return-object
multiple
chips
......@@ -18,7 +17,6 @@
])
"
:value="persons"
:loading="$apollo.queries.allPersons.loading"
@input="$emit('persons', $event)"
/>
</div>
......@@ -77,7 +75,8 @@
<script>
import AbsenceReasonGroupSelect from "aleksis.apps.kolego/components/AbsenceReasonGroupSelect.vue";
import DateTimeField from "aleksis.core/components/generic/forms/DateTimeField.vue";
import { persons } from "./absenceCreation.graphql";
import PersonField from "aleksis.core/components/generic/forms/PersonField.vue";
import { gqlPersons } from "./absenceCreation.graphql";
import formRulesMixin from "aleksis.core/mixins/formRulesMixin.js";
import { DateTime } from "luxon";
......@@ -86,6 +85,7 @@ export default {
components: {
AbsenceReasonGroupSelect,
DateTimeField,
PersonField,
},
mixins: [formRulesMixin],
emits: [
......@@ -96,8 +96,10 @@ export default {
"comment",
"absence-reason",
],
apollo: {
allPersons: persons,
data() {
return {
gqlQuery: gqlPersons,
};
},
props: {
persons: {
......
# Uses core persons query
query persons {
allPersons: absenceCreationPersons {
query gqlPersons {
items: absenceCreationPersons {
id
fullName
shortName
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment