src/components/schedule/tabs/tabs.component.html

@@ -16,16 +16,21 @@
         <app-lecture-hall #lectureHallTab (eventResult)="lectureHallSelected($event)"/>
     </div>
   </mat-tab>
-
+  <!--
-  <mat-tab label="Другое" *appHasRole="AuthRoles.Admin">
+  <mat-tab label="Другое">
     <div class="margin-other-button">
-      <app-other idButton="disciplines-button" textButton="Дисциплины" #discipline (retryLoadData)="loadDisciplines()"/>
+      <app-other idButton="disciplines-button" textButton="Дисциплины" #discipline [dataLoaded]="disciplinesLoaded"
-      <app-other idButton="lecture-button" textButton="Кабинеты" #lecture (retryLoadData)="loadLectureHalls()"/>
+                 (retryLoadData)="loadDisciplines()"/>
-      <app-other idButton="group-button" textButton="Группы" #group (retryLoadData)="loadGroups()"/>
+      <app-other idButton="lecture-button" textButton="Кабинеты" #lecture
-      <app-other idButton="professor-button" textButton="Профессоры" #professor (retryLoadData)="loadProfessors()"/>
+                 [dataLoaded]="campusesLoaded && lectureHallsLoaded" (retryLoadData)="loadLectureHalls()"/>
+      <app-other idButton="group-button" textButton="Группы" #group [dataLoaded]="facultiesLoaded && groupLoaded"
+                 (retryLoadData)="loadGroups()"/>
+      <app-other idButton="professor-button" textButton="Профессоры" #professor [dataLoaded]="professorsLoaded"
+                 (retryLoadData)="professorsLoad()"/>
       <section>
-        <button mat-flat-button (click)="otherFilter()">Отфильтровать</button>
+        <button mat-flat-button>Отфильтровать</button>
       </section>
     </div>
   </mat-tab>
+  -->
 </mat-tab-group>

src/components/schedule/tabs/tabs.component.ts

@@ -1,7 +1,7 @@
 import {AfterViewInit, Component, EventEmitter, Output, ViewChild} from '@angular/core';
 import {OtherComponent, SelectData} from "@component/schedule/tabs/other/other.component";
 import {MatTab, MatTabGroup} from "@angular/material/tabs";
-import {Observable} from "rxjs";
+import {map, Observable} from "rxjs";
 import {FormsModule, ReactiveFormsModule} from "@angular/forms";
 import {MatButton} from "@angular/material/button";
 import {DataSpinnerComponent} from "@component/common/data-spinner/data-spinner.component";
@@ -74,6 +74,30 @@ export class TabsComponent implements AfterViewInit {
         TabsSelect.Group,
         id,
         this.scheduleApi.getByGroup(id)
+          .pipe(
+            map(g =>
+              g.map(data =>
+                ({
+                  dayOfWeek: data.dayOfWeek,
+                  pairNumber: data.pairNumber,
+                  isEven: data.isEven,
+                  discipline: data.discipline,
+                  disciplineId: data.disciplineId,
+                  isExcludedWeeks: data.isExcludedWeeks,
+                  weeks: data.weeks,
+                  typeOfOccupations: data.typeOfOccupations,
+                  group: data.group,
+                  groupId: data.groupId,
+                  lectureHalls: data.lectureHalls,
+                  lectureHallsId: data.lectureHallsId,
+                  professors: data.professors,
+                  professorsId: data.professorsId,
+                  campus: data.campus,
+                  campusId: data.campusId,
+                  linkToMeet: data.linkToMeet
+                }))
+            )
+          )
       ]
     );
   }
@@ -84,6 +108,30 @@ export class TabsComponent implements AfterViewInit {
         TabsSelect.Professor,
         id,
         this.scheduleApi.getByProfessor(id)
+          .pipe(
+            map(p =>
+              p.map(data =>
+                ({
+                  dayOfWeek: data.dayOfWeek,
+                  pairNumber: data.pairNumber,
+                  isEven: data.isEven,
+                  discipline: data.discipline,
+                  disciplineId: data.disciplineId,
+                  isExcludedWeeks: data.isExcludedWeeks,
+                  weeks: data.weeks,
+                  typeOfOccupations: data.typeOfOccupations,
+                  group: data.group,
+                  groupId: data.groupId,
+                  lectureHalls: data.lectureHalls,
+                  lectureHallsId: data.lectureHallsId,
+                  professors: data.professors,
+                  professorsId: data.professorsId,
+                  campus: data.campus,
+                  campusId: data.campusId,
+                  linkToMeet: data.linkToMeet
+                }))
+            )
+          )
       ]
     );
   }
@@ -94,6 +142,30 @@ export class TabsComponent implements AfterViewInit {
         TabsSelect.LectureHall,
         id,
         this.scheduleApi.getByLectureHall(id)
+          .pipe(
+            map(lh =>
+              lh.map(data =>
+                ({
+                  dayOfWeek: data.dayOfWeek,
+                  pairNumber: data.pairNumber,
+                  isEven: data.isEven,
+                  discipline: data.discipline,
+                  disciplineId: data.disciplineId,
+                  isExcludedWeeks: data.isExcludedWeeks,
+                  weeks: data.weeks,
+                  typeOfOccupations: data.typeOfOccupations,
+                  group: data.group,
+                  groupId: data.groupId,
+                  lectureHalls: data.lectureHalls,
+                  lectureHallsId: data.lectureHallsId,
+                  professors: data.professors,
+                  professorsId: data.professorsId,
+                  campus: data.campus,
+                  campusId: data.campusId,
+                  linkToMeet: data.linkToMeet
+                }))
+            )
+          )
       ]
     );
   }
@@ -168,19 +240,4 @@ export class TabsComponent implements AfterViewInit {
 
   @ViewChild('tabGroup') tabs!: MatTabGroup;
   protected readonly AuthRoles = AuthRoles;
-
-  protected otherFilter() {
-    this.eventResult.emit(
-      [
-        TabsSelect.Other,
-        0,
-        this.scheduleApi.postSchedule(({
-          groups: this.groupEx.selectedIds,
-          disciplines: this.disciplineEx.selectedIds,
-          professors: this.professorEx.selectedIds,
-          lectureHalls: this.lectureHallEx.selectedIds
-        }))
-      ]
-    );
-  }
 }

src/pages/schedule/schedule.component.ts

@@ -45,13 +45,13 @@ export class ScheduleComponent {
   @ViewChild('tableHeader') childComponent!: TableHeaderComponent;
 
   constructor(api: ScheduleService) {
+    this.calculateCurrentWeek();
     this.startTerm = new Date(1, 1, 1);
     api.pairPeriod().subscribe(date => {
       this.pairPeriods = date;
     });
     api.startTerm().subscribe(date => {
       this.startTerm = date.date;
-      this.calculateCurrentWeek();
     });
   }