fix: delete data if top-level data is selected
All checks were successful
Build and Deploy Angular App / build (push) Successful in 2m3s
All checks were successful
Build and Deploy Angular App / build (push) Successful in 2m3s
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
import {Component, EventEmitter, Output, ViewChild} from '@angular/core';
|
||||
import {Component, EventEmitter, ViewChild} from '@angular/core';
|
||||
import {MatExpansionModule, MatExpansionPanel} from "@angular/material/expansion";
|
||||
import {MatChipListbox, MatChipsModule} from '@angular/material/chips';
|
||||
import {FormControl, FormsModule, ReactiveFormsModule} from "@angular/forms";
|
||||
@ -9,7 +9,11 @@ import {FacultyResponse} from "@api/v1/facultyResponse";
|
||||
import {FacultyService} from "@api/v1/faculty.service";
|
||||
import {GroupService} from "@api/v1/group.service";
|
||||
import {IScheduleTab} from "@component/schedule/tabs/ischedule-tab";
|
||||
import {TabSelect, TabSelectData, TabSelectType, TabStorageService} from "@service/tab-storage.service";
|
||||
import {TabSelect, TabStorageService} from "@service/tab-storage.service";
|
||||
|
||||
enum Enclosure {
|
||||
faculty, course, group
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-group',
|
||||
@ -25,7 +29,6 @@ import {TabSelect, TabSelectData, TabSelectType, TabStorageService} from "@servi
|
||||
styleUrl: './group.component.css',
|
||||
providers: [FacultyService, GroupService]
|
||||
})
|
||||
|
||||
export class GroupComponent implements IScheduleTab {
|
||||
protected faculties: FacultyResponse[] | null = null;
|
||||
protected courseNumbers: number[] | null = null;
|
||||
@ -51,13 +54,50 @@ export class GroupComponent implements IScheduleTab {
|
||||
@ViewChild('courseIndicator') courseIndicator!: LoadingIndicatorComponent;
|
||||
@ViewChild('groupIndicator') groupIndicator!: LoadingIndicatorComponent;
|
||||
|
||||
@Output() eventResult = new EventEmitter<number>();
|
||||
|
||||
constructor(private facultyApi: FacultyService, private groupApi: GroupService, private tabStorage: TabStorageService) {
|
||||
private resetCourse() {
|
||||
this.courseNumber = null;
|
||||
this.groups = [];
|
||||
this.formChipCourse.reset();
|
||||
this.courseChip.value = undefined;
|
||||
}
|
||||
|
||||
existParams(data: TabSelectData): boolean {
|
||||
return data.selected['group'] !== undefined || data.selected['course'] !== undefined || data.selected['faculty'] !== undefined;
|
||||
private resetGroup() {
|
||||
this.filteredGroupsBehaviour = [];
|
||||
this.filteredGroupsMagistracy = [];
|
||||
this.filteredGroupsSpecialist = [];
|
||||
this.formChipGroup.reset();
|
||||
this.groupChip.value = undefined;
|
||||
}
|
||||
|
||||
public eventResult = new EventEmitter<number>();
|
||||
public selectChangeEvent = new EventEmitter<TabSelect[]>();
|
||||
|
||||
constructor(private facultyApi: FacultyService, private groupApi: GroupService) {
|
||||
}
|
||||
|
||||
private getSelectedTabs(): TabSelect[] {
|
||||
const faculty = this.facultyChip.value;
|
||||
const course = this.courseChip.value;
|
||||
const group = this.groupChip.value;
|
||||
|
||||
const result: TabSelect[] = [];
|
||||
|
||||
if (faculty)
|
||||
result.push(new TabSelect(faculty, this.faculties!.find(x => x.id === faculty)?.name ?? ''));
|
||||
|
||||
if (course)
|
||||
result.push(new TabSelect(course, course.toString()));
|
||||
|
||||
if (group)
|
||||
result.push(new TabSelect(group, this.groups!.find(x => x.id == group)?.name ?? ''));
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public getEnclosureList(): string[] {
|
||||
return Object.keys(Enclosure).filter((item) => {
|
||||
return isNaN(Number(item));
|
||||
});
|
||||
}
|
||||
|
||||
protected loadFaculties() {
|
||||
@ -69,7 +109,8 @@ export class GroupComponent implements IScheduleTab {
|
||||
.subscribe(data => {
|
||||
this.faculties = data;
|
||||
|
||||
let selected = TabStorageService.selected?.selected['faculty'];
|
||||
let selected = TabStorageService.selected?.selected[this.getEnclosureList()[Enclosure.faculty]];
|
||||
|
||||
if (selected) {
|
||||
let selectedFaculty = data.find(x => x.id === selected.index);
|
||||
|
||||
@ -78,7 +119,7 @@ export class GroupComponent implements IScheduleTab {
|
||||
|
||||
if (selectedFaculty !== undefined) {
|
||||
TabStorageService.trySelectChip(selectedFaculty.id, this.facultyChip);
|
||||
this.onFacultySelected(selectedFaculty.id);
|
||||
this.onFacultySelected(selectedFaculty.id, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -104,7 +145,7 @@ export class GroupComponent implements IScheduleTab {
|
||||
.sort((a, b) => a - b))
|
||||
);
|
||||
|
||||
let selected = TabStorageService.selected?.selected['course'];
|
||||
let selected = TabStorageService.selected?.selected[this.getEnclosureList()[Enclosure.course]];
|
||||
if (selected) {
|
||||
let selectedCourse = this.courseNumbers.find(x => x === selected.index);
|
||||
|
||||
@ -113,11 +154,11 @@ export class GroupComponent implements IScheduleTab {
|
||||
|
||||
if (selectedCourse !== undefined) {
|
||||
TabStorageService.trySelectChip(selectedCourse, this.courseChip);
|
||||
this.onCourseSelected(selectedCourse);
|
||||
this.onCourseSelected(selectedCourse, true);
|
||||
}
|
||||
}
|
||||
|
||||
let selectedGroupStorage = TabStorageService.selected?.selected['group'];
|
||||
let selectedGroupStorage = TabStorageService.selected?.selected[this.getEnclosureList()[Enclosure.group]];
|
||||
if (selectedGroupStorage) {
|
||||
let selectedGroup = data.find(x => x.id === selectedGroupStorage.index);
|
||||
|
||||
@ -126,7 +167,7 @@ export class GroupComponent implements IScheduleTab {
|
||||
|
||||
if (selectedGroup !== undefined) {
|
||||
TabStorageService.trySelectChip(selectedGroup.id, this.groupChip);
|
||||
this.onGroupSelected(selectedGroup.id);
|
||||
this.onGroupSelected(selectedGroup.id, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -147,18 +188,19 @@ export class GroupComponent implements IScheduleTab {
|
||||
}
|
||||
}
|
||||
|
||||
protected onFacultySelected(index: number) {
|
||||
this.courseNumber = null;
|
||||
this.groups = [];
|
||||
this.formChipGroup.reset();
|
||||
this.formChipCourse.reset();
|
||||
protected onFacultySelected(index: number, loadMode: boolean = false) {
|
||||
this.resetCourse();
|
||||
this.resetGroup();
|
||||
|
||||
if (index === undefined) {
|
||||
this.facultyId = null;
|
||||
return;
|
||||
}
|
||||
|
||||
this.tabStorage.select(new TabSelect(index, this.faculties!.find(x => x.id === index)?.name ?? ''), TabSelectType.group, 'faculty');
|
||||
if (loadMode)
|
||||
this.facultyChip.value = index;
|
||||
else
|
||||
this.selectChangeEvent.emit(this.getSelectedTabs());
|
||||
|
||||
this.facultyId = index;
|
||||
this.courseNumberPanel.open();
|
||||
@ -166,29 +208,32 @@ export class GroupComponent implements IScheduleTab {
|
||||
this.loadCourseGroup();
|
||||
}
|
||||
|
||||
protected onCourseSelected(course: number) {
|
||||
this.filteredGroupsBehaviour = [];
|
||||
this.filteredGroupsMagistracy = [];
|
||||
this.filteredGroupsSpecialist = [];
|
||||
this.formChipGroup.reset();
|
||||
protected onCourseSelected(course: number, loadMode: boolean = false) {
|
||||
this.resetGroup();
|
||||
|
||||
if (course === undefined) {
|
||||
this.courseNumber = null;
|
||||
return;
|
||||
}
|
||||
|
||||
this.tabStorage.select(new TabSelect(course, course.toString()), TabSelectType.group, 'course');
|
||||
if (loadMode)
|
||||
this.courseChip.value = course;
|
||||
else
|
||||
this.selectChangeEvent.emit(this.getSelectedTabs());
|
||||
|
||||
this.courseNumber = course;
|
||||
this.groupPanel.open();
|
||||
this.loadCourseGroup();
|
||||
}
|
||||
|
||||
protected onGroupSelected(index: number) {
|
||||
protected onGroupSelected(index: number, loadMode: boolean = false) {
|
||||
if (index === undefined)
|
||||
return;
|
||||
|
||||
this.tabStorage.select(new TabSelect(index, this.groups!.find(x => x.id == index)?.name ?? ''), TabSelectType.group, 'group');
|
||||
if (loadMode)
|
||||
this.groupChip.value = index;
|
||||
|
||||
this.selectChangeEvent.emit(this.getSelectedTabs());
|
||||
|
||||
this.groupPanel.close();
|
||||
this.eventResult.emit(index);
|
||||
|
Reference in New Issue
Block a user