Skip to content
Snippets Groups Projects
Commit ce0953b7 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Use generic PersonField from core

parent f18aa785
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 #195051 failed
...@@ -4,10 +4,9 @@ ...@@ -4,10 +4,9 @@
<v-row> <v-row>
<div aria-required="true" class="full-width"> <div aria-required="true" class="full-width">
<!-- FIXME Vue 3: clear-on-select --> <!-- FIXME Vue 3: clear-on-select -->
<v-autocomplete <person-field
:gql-query="gqlQuery"
:label="$t('forms.labels.persons')" :label="$t('forms.labels.persons')"
:items="allPersons"
item-text="fullName"
return-object return-object
multiple multiple
chips chips
...@@ -18,7 +17,6 @@ ...@@ -18,7 +17,6 @@
]) ])
" "
:value="persons" :value="persons"
:loading="$apollo.queries.allPersons.loading"
@input="$emit('persons', $event)" @input="$emit('persons', $event)"
/> />
</div> </div>
...@@ -77,7 +75,8 @@ ...@@ -77,7 +75,8 @@
<script> <script>
import AbsenceReasonGroupSelect from "aleksis.apps.kolego/components/AbsenceReasonGroupSelect.vue"; import AbsenceReasonGroupSelect from "aleksis.apps.kolego/components/AbsenceReasonGroupSelect.vue";
import DateTimeField from "aleksis.core/components/generic/forms/DateTimeField.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 formRulesMixin from "aleksis.core/mixins/formRulesMixin.js";
import { DateTime } from "luxon"; import { DateTime } from "luxon";
...@@ -86,6 +85,7 @@ export default { ...@@ -86,6 +85,7 @@ export default {
components: { components: {
AbsenceReasonGroupSelect, AbsenceReasonGroupSelect,
DateTimeField, DateTimeField,
PersonField,
}, },
mixins: [formRulesMixin], mixins: [formRulesMixin],
emits: [ emits: [
...@@ -96,8 +96,10 @@ export default { ...@@ -96,8 +96,10 @@ export default {
"comment", "comment",
"absence-reason", "absence-reason",
], ],
apollo: { data() {
allPersons: persons, return {
gqlQuery: gqlPersons,
};
}, },
props: { props: {
persons: { persons: {
......
# Uses core persons query # Uses core persons query
query persons { query gqlPersons {
allPersons: absenceCreationPersons { items: absenceCreationPersons {
id id
fullName 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