From e8fd7954a4f55ac73609e8d16a4f144f06b62bac Mon Sep 17 00:00:00 2001 From: Artem Netsvetaev Date: Wed, 5 Jul 2023 17:44:15 +0300 Subject: [PATCH] - event array of groups --- src/api/models/index.ts | 2 +- src/api/timetable/TimetableEventApi.ts | 2 +- src/components/EventRow.vue | 2 +- src/views/timetable/event/AsyncContent.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/models/index.ts b/src/api/models/index.ts index 353dfd35..2519d950 100644 --- a/src/api/models/index.ts +++ b/src/api/models/index.ts @@ -27,7 +27,7 @@ export interface StudyGroup extends Entity { export interface Event extends Entity { name: string; room: Room[]; - group: StudyGroup; + group: StudyGroup[]; lecturer: Lecturer[]; start_ts: string; end_ts: string; diff --git a/src/api/timetable/TimetableEventApi.ts b/src/api/timetable/TimetableEventApi.ts index 10ce410b..dc8e0acf 100644 --- a/src/api/timetable/TimetableEventApi.ts +++ b/src/api/timetable/TimetableEventApi.ts @@ -4,7 +4,7 @@ import { TimetableEntityBaseApi } from './TimetaableEntityBaseApi'; type ModifyEventBody = Pick & { room_id: number[]; - group_id: number; + group_id: number[]; lecturer_id: number[]; }; diff --git a/src/components/EventRow.vue b/src/components/EventRow.vue index 730db3bf..36456da0 100644 --- a/src/components/EventRow.vue +++ b/src/components/EventRow.vue @@ -28,7 +28,7 @@ const info = computed(() => { } if (props.info.includes('group')) { - arr.push(props.event.group.number); + arr.push(props.event.group.map(g => g.number).join(', ')); } return arr.filter(c => Boolean(c)).join(' • '); diff --git a/src/views/timetable/event/AsyncContent.vue b/src/views/timetable/event/AsyncContent.vue index 32b09927..311df4bd 100644 --- a/src/views/timetable/event/AsyncContent.vue +++ b/src/views/timetable/event/AsyncContent.vue @@ -70,7 +70,7 @@ const lecturers = computed(() => {