From 578fdff6ca7ff9c7cd9254318ca4ea8b789800be Mon Sep 17 00:00:00 2001 From: Polianin Nikita Date: Fri, 30 Aug 2024 17:00:33 +0300 Subject: [PATCH] fix: correct show special weeks --- src/components/schedule/table/table.component.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/schedule/table/table.component.ts b/src/components/schedule/table/table.component.ts index add7aca..3f18d53 100644 --- a/src/components/schedule/table/table.component.ts +++ b/src/components/schedule/table/table.component.ts @@ -83,6 +83,7 @@ export class TableComponent implements OnChanges { filteredData = filteredData.filter(x => x.isExcludedWeeks == undefined || x.weeks == undefined || + x.weeks.length == 0 || (x.isExcludedWeeks && !x.weeks.includes(this.currentWeek)) || (!x.isExcludedWeeks && x.weeks.includes(this.currentWeek)) ); @@ -99,12 +100,12 @@ export class TableComponent implements OnChanges { convertedData.data[dayOfWeek.toString()] = Object.values(groupedData).map(item => { item.group = item.groups.join(', '); - if (this.isDisciplineWithWeeks && item.weeks && item.isExcludedWeeks !== undefined) { - if (this.backupDisciplines[item.disciplineId]) { + if (this.isDisciplineWithWeeks && item.weeks !== undefined && item.weeks.length > 0 && item.isExcludedWeeks !== undefined) { + if (this.backupDisciplines[item.disciplineId]) item.discipline = this.backupDisciplines[item.disciplineId]; - } else { + else this.backupDisciplines[item.disciplineId] = item.discipline; - } + item.discipline = `${item.isExcludedWeeks ? 'кр.' : 'н.'} ${item.weeks.join(', ')} ${item.discipline}`; } else if (this.backupDisciplines[item.disciplineId]) item.discipline = this.backupDisciplines[item.disciplineId];