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

Adapt to teacher field

parent 621b9b31
No related branches found
No related tags found
1 merge request!329Introduce substitution to do list
Pipeline #186430 failed
......@@ -87,6 +87,11 @@ mutation createOrUpdateSubstitutions($input: [SubstitutionInputType]!) {
name
colourFg
colourBg
teachers {
id
shortName
fullName
}
}
teachers {
id
......@@ -109,6 +114,11 @@ mutation createOrUpdateSubstitutions($input: [SubstitutionInputType]!) {
name
colourFg
colourBg
teachers {
id
shortName
fullName
}
}
}
amends {
......@@ -124,6 +134,11 @@ mutation createOrUpdateSubstitutions($input: [SubstitutionInputType]!) {
name
colourFg
colourBg
teachers {
id
shortName
fullName
}
}
groups {
id
......@@ -171,6 +186,11 @@ query amendedLessonsFromAbsences(
name
colourFg
colourBg
teachers {
id
shortName
fullName
}
}
teachers {
id
......@@ -188,6 +208,11 @@ query amendedLessonsFromAbsences(
name
colourFg
colourBg
teachers {
id
shortName
fullName
}
}
name
}
......@@ -209,6 +234,11 @@ query amendedLessonsFromAbsences(
name
colourFg
colourBg
teachers {
id
shortName
fullName
}
}
groups {
id
......
......@@ -2,8 +2,9 @@
import DeleteButton from "aleksis.core/components/generic/buttons/DeleteButton.vue";
import SubstitutionInformation from "./SubstitutionInformation.vue";
import LessonRelatedObjectChip from "../LessonRelatedObjectChip.vue";
import TeacherField from "aleksis.apps.cursus/components/TeacherField.vue";
import { gqlRooms, gqlPersons } from "../amendLesson.graphql";
import { gqlRooms } from "../amendLesson.graphql";
import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
</script>
......@@ -53,7 +54,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
v-for="room in roomsWithStatus.filter(
(t) => t.status === 'regular',
)"
class="mb-2"
class="mb-1"
small
>
{{ room.shortName }}
......@@ -65,7 +66,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
)"
outlined
color="error"
class="mb-2"
class="mb-1"
small
>
<v-icon left>mdi-cancel</v-icon>
......@@ -80,7 +81,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
:input-value="data.selected"
v-if="getRoomStatus(data.item) === 'new'"
close
class="mb-2 mt-1"
class="mb-1 mt-1"
small
outlined
color="success"
......@@ -92,17 +93,14 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
</template>
</v-autocomplete>
<v-autocomplete
<teacher-field
:subject="subject"
:value="substitutionTeacherIDs"
multiple
chips
deletable-chips
dense
hide-details
outlined
:items="amendableTeachers"
item-text="fullName"
item-value="id"
:disabled="loading"
@input="teachersInput"
>
......@@ -113,7 +111,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
)"
outlined
color="error"
class="mb-2"
class="mb-1"
small
>
<v-icon left>mdi-account-off-outline</v-icon>
......@@ -127,7 +125,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
v-bind="data.attrs"
:input-value="data.selected"
close
class="mb-2 mt-1"
class="mb-1 mt-1"
small
:outlined="getTeacherStatus(data.item) === 'new'"
:color="getTeacherStatus(data.item) === 'new' ? 'success' : ''"
......@@ -139,7 +137,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
{{ data.item.fullName }}
</v-chip>
</template>
</v-autocomplete>
</teacher-field>
<v-chip-group
column
......@@ -321,9 +319,17 @@ export default {
});
return roomsWithStatus;
},
subject() {
return this.substitution.subject
? this.substitution.subject
: this.substitution.course?.subject
? this.substitution.course.subject
: this.substitution.amends?.subject
? this.substitution.amends.subject
: undefined;
},
},
apollo: {
amendableTeachers: gqlPersons,
amendableRooms: gqlRooms,
},
};
......
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