Skip to content

- event array of groups #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
netsvetoch merged 1 commit into from
Jul 5, 2023
Merged

- event array of groups #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/api/timetable/TimetableEventApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { TimetableEntityBaseApi } from './TimetaableEntityBaseApi';

type ModifyEventBody = Pick<Event, 'name' | 'start_ts' | 'end_ts'> & {
room_id: number[];
group_id: number;
group_id: number[];
lecturer_id: number[];
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/EventRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(' • ');
Expand Down
2 changes: 1 addition & 1 deletion src/views/timetable/event/AsyncContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const lecturers = computed(() => {
<template>
<h2 class="h2">{{ event?.name }}</h2>

<DataRow title="Группа" :info="event?.group.number" class="row">
<DataRow title="Группа" :info="event?.group.map(g => g.number).join(', ')" class="row">
<MaterialIcon name="group" class="icon" />
</DataRow>

Expand Down