Winsomnia/MireaFrontend
1
0
Fork 0
Code Pull Requests Actions Projects Releases Activity

fix: correct show special weeks

Browse Source
This commit is contained in:
Polianin Nikita 2024-08-30 17:00:33 +03:00
parent 4bfd919bbc
commit 578fdff6ca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/schedule/table/table.component.ts
View File

@ -83,6 +83,7 @@ export class TableComponent implements OnChanges {
filteredData = filteredData.filter(x => filteredData = filteredData.filter(x =>
x.isExcludedWeeks == undefined || x.isExcludedWeeks == undefined ||
x.weeks == undefined || x.weeks == undefined ||
x.weeks.length == 0 ||
(x.isExcludedWeeks && !x.weeks.includes(this.currentWeek)) || (x.isExcludedWeeks && !x.weeks.includes(this.currentWeek)) ||
(!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 => { convertedData.data[dayOfWeek.toString()] = Object.values(groupedData).map(item => {
item.group = item.groups.join(', '); item.group = item.groups.join(', ');
if (this.isDisciplineWithWeeks && item.weeks && item.isExcludedWeeks !== undefined) { if (this.isDisciplineWithWeeks && item.weeks !== undefined && item.weeks.length > 0 && item.isExcludedWeeks !== undefined) {
if (this.backupDisciplines[item.disciplineId]) { if (this.backupDisciplines[item.disciplineId])
item.discipline = this.backupDisciplines[item.disciplineId]; item.discipline = this.backupDisciplines[item.disciplineId];
} else { else
this.backupDisciplines[item.disciplineId] = item.discipline; this.backupDisciplines[item.disciplineId] = item.discipline;
}
item.discipline = `${item.isExcludedWeeks ? 'кр.' : 'н.'} ${item.weeks.join(', ')} ${item.discipline}`; item.discipline = `${item.isExcludedWeeks ? 'кр.' : 'н.'} ${item.weeks.join(', ')} ${item.discipline}`;
} else if (this.backupDisciplines[item.disciplineId]) } else if (this.backupDisciplines[item.disciplineId])
item.discipline = this.backupDisciplines[item.disciplineId]; item.discipline = this.backupDisciplines[item.disciplineId];