From 69d2db8623f11ac747d223419cf680fe7c2d6e1b Mon Sep 17 00:00:00 2001 From: N08I40K Date: Sun, 2 Mar 2025 20:56:24 +0400 Subject: [PATCH] =?UTF-8?q?=D0=95=D1=81=D0=BB=D0=B8=20=D0=B2=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B8=20=D1=83?= =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B0=20=D1=82=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=BE=D0=B4=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B0,=20=D1=82=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B=20=D0=B1=D1=83?= =?UTF-8?q?=D0=B4=D0=B5=D1=82=20=D1=8F=D0=B2=D0=BD=D0=BE=20=D1=83=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D0=B0=D0=BD=D0=BE,=20=D1=87=D1=82=D0=BE=20=D0=B8?= =?UTF-8?q?=D0=BC=20=D0=BD=D0=B5=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D0=B8?= =?UTF-8?q?=D0=B4=D1=82=D0=B8=20=D0=BD=D0=B0=20=D1=8D=D1=82=D1=83=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/schedule-parser/schedule-parser.ts | 15 +++++++++++++-- src/schedule/schedule.service.ts | 3 ++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/schedule/internal/schedule-parser/schedule-parser.ts b/src/schedule/internal/schedule-parser/schedule-parser.ts index ed1ec69..cee7e51 100644 --- a/src/schedule/internal/schedule-parser/schedule-parser.ts +++ b/src/schedule/internal/schedule-parser/schedule-parser.ts @@ -248,8 +248,19 @@ export class ScheduleParser { // фикс, если у кого-то отсутствует индекс подгруппы // если 1 преподаватель - if (subGroups.length === 1) subGroups[0].number = 1; - else if (subGroups.length === 2) { + if (subGroups.length === 1) { + if (subGroups[0].number === 0) { + subGroups[0].number = 1; + } else { + subGroups.push( + new LessonSubGroup({ + number: subGroups[0].number === 1 ? 2 : 1, + cabinet: null, + teacher: `Только у другой`, + }), + ); + } + } else if (subGroups.length === 2) { // если индексы отсутствуют у обоих, ставим поочерёдно if (subGroups[0].number === 0 && subGroups[1].number === 0) { subGroups[0].number = 1; diff --git a/src/schedule/schedule.service.ts b/src/schedule/schedule.service.ts index 564e6ec..b2281c7 100644 --- a/src/schedule/schedule.service.ts +++ b/src/schedule/schedule.service.ts @@ -194,7 +194,8 @@ export class ScheduleService { const names: Array = []; for (const name of schedule.teachers.keys()) { - if (name === "Ошибка в расписании") continue; + if (name === "Ошибка в расписании" || name === "Только у другой") + continue; names.push(name); }