From ea4443491bb548d50d466c0de5d71893c70779d5 Mon Sep 17 00:00:00 2001 From: Djesika Vacheva Date: Fri, 17 Jul 2026 17:46:02 +0300 Subject: [PATCH 1/2] rename interfaces --- uniplanWeb/pr-review.patch | Bin 0 -> 82446 bytes .../interfaces/{faculty-elm.ts => faculty.ts} | 2 +- .../core/interfaces/{major-elm.ts => major.ts} | 2 +- .../src/app/core/interfaces/room-view-model.ts | 6 +++--- .../core/interfaces/{room-elm.ts => room.ts} | 2 +- .../interfaces/{student-elm.ts => student.ts} | 2 +- .../faculty-add-form/faculty-add-form.ts | 4 ++-- .../faculty/faculty-panel/faculty-panel.spec.ts | 4 ++-- .../src/app/features/faculty/faculty-service.ts | 6 +++--- .../faculty/faculty-table/faculty-table.ts | 8 ++++---- .../major/major-add-form/major-add-form.ts | 4 ++-- .../major/major-edit-form/major-edit-form.ts | 4 ++-- .../major/major-panel/major-panel.spec.ts | 8 ++++---- .../features/major/major-panel/major-panel.ts | 4 ++-- .../src/app/features/major/major-service.ts | 8 ++++---- .../features/major/major-table/major-table.ts | 12 ++++++------ .../src/app/features/room/room-service.ts | 6 +++--- .../student/student-panel/student-panel.ts | 4 ++-- .../student/student-table/student-table.ts | 14 +++++++------- .../features/university/university-service.ts | 6 +++--- 20 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 uniplanWeb/pr-review.patch rename uniplanWeb/src/app/core/interfaces/{faculty-elm.ts => faculty.ts} (77%) rename uniplanWeb/src/app/core/interfaces/{major-elm.ts => major.ts} (83%) rename uniplanWeb/src/app/core/interfaces/{room-elm.ts => room.ts} (70%) rename uniplanWeb/src/app/core/interfaces/{student-elm.ts => student.ts} (84%) diff --git a/uniplanWeb/pr-review.patch b/uniplanWeb/pr-review.patch new file mode 100644 index 0000000000000000000000000000000000000000..cd480bdd5bc35dd5421368a8e9ee0fac9b7a60a2 GIT binary patch literal 82446 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 literal 0 HcmV?d00001 diff --git a/uniplanWeb/src/app/core/interfaces/faculty-elm.ts b/uniplanWeb/src/app/core/interfaces/faculty.ts similarity index 77% rename from uniplanWeb/src/app/core/interfaces/faculty-elm.ts rename to uniplanWeb/src/app/core/interfaces/faculty.ts index d7ccfc3..efcd154 100644 --- a/uniplanWeb/src/app/core/interfaces/faculty-elm.ts +++ b/uniplanWeb/src/app/core/interfaces/faculty.ts @@ -1,4 +1,4 @@ -export interface FacultyElm { +export interface Faculty { id: string; facultyName: string; position: number; diff --git a/uniplanWeb/src/app/core/interfaces/major-elm.ts b/uniplanWeb/src/app/core/interfaces/major.ts similarity index 83% rename from uniplanWeb/src/app/core/interfaces/major-elm.ts rename to uniplanWeb/src/app/core/interfaces/major.ts index 02e3f07..e0ddfe3 100644 --- a/uniplanWeb/src/app/core/interfaces/major-elm.ts +++ b/uniplanWeb/src/app/core/interfaces/major.ts @@ -1,4 +1,4 @@ -export interface MajorElm { +export interface Major { id: string; courseId: string; facultyId: string; diff --git a/uniplanWeb/src/app/core/interfaces/room-view-model.ts b/uniplanWeb/src/app/core/interfaces/room-view-model.ts index 9acc24d..e09015d 100644 --- a/uniplanWeb/src/app/core/interfaces/room-view-model.ts +++ b/uniplanWeb/src/app/core/interfaces/room-view-model.ts @@ -1,5 +1,5 @@ -import { RoomElm } from "./room-elm"; +import { Room } from "./room"; -export interface RoomViewModel extends RoomElm { +export interface RoomViewModel extends Room { position: number; -} \ No newline at end of file +} diff --git a/uniplanWeb/src/app/core/interfaces/room-elm.ts b/uniplanWeb/src/app/core/interfaces/room.ts similarity index 70% rename from uniplanWeb/src/app/core/interfaces/room-elm.ts rename to uniplanWeb/src/app/core/interfaces/room.ts index 655e906..ba3b46c 100644 --- a/uniplanWeb/src/app/core/interfaces/room-elm.ts +++ b/uniplanWeb/src/app/core/interfaces/room.ts @@ -1,4 +1,4 @@ -export interface RoomElm { +export interface Room { id: string; facultyId: string; roomNumber: string; diff --git a/uniplanWeb/src/app/core/interfaces/student-elm.ts b/uniplanWeb/src/app/core/interfaces/student.ts similarity index 84% rename from uniplanWeb/src/app/core/interfaces/student-elm.ts rename to uniplanWeb/src/app/core/interfaces/student.ts index f826a9b..d11ef70 100644 --- a/uniplanWeb/src/app/core/interfaces/student-elm.ts +++ b/uniplanWeb/src/app/core/interfaces/student.ts @@ -1,4 +1,4 @@ -export interface StudentElm { +export interface Student { position: number; name: string; facultyNumber: string; diff --git a/uniplanWeb/src/app/features/faculty/faculty-add-form/faculty-add-form.ts b/uniplanWeb/src/app/features/faculty/faculty-add-form/faculty-add-form.ts index ecccdc2..7746f38 100644 --- a/uniplanWeb/src/app/features/faculty/faculty-add-form/faculty-add-form.ts +++ b/uniplanWeb/src/app/features/faculty/faculty-add-form/faculty-add-form.ts @@ -8,7 +8,7 @@ import { MatOptionModule } from '@angular/material/core'; import { AddForm } from '../../../core/shared/add-form/add-form'; import { FacultyService } from '../faculty-service'; import { - UniversityElm, + University, UniversityService, } from '../../university/university-service'; import { TranslatePipe } from '@ngx-translate/core'; @@ -39,7 +39,7 @@ export class FacultyAddForm implements OnInit { facultyName = ''; location = ''; universityId = ''; - universities: UniversityElm[] = []; + universities: University[] = []; ngOnInit(): void { this.universityService.getAllUniversities().subscribe({ diff --git a/uniplanWeb/src/app/features/faculty/faculty-panel/faculty-panel.spec.ts b/uniplanWeb/src/app/features/faculty/faculty-panel/faculty-panel.spec.ts index 6a9e118..0fdb43f 100644 --- a/uniplanWeb/src/app/features/faculty/faculty-panel/faculty-panel.spec.ts +++ b/uniplanWeb/src/app/features/faculty/faculty-panel/faculty-panel.spec.ts @@ -4,7 +4,7 @@ import { Subject, of } from 'rxjs'; import { translateTestingProviders } from '@testing/translate-testing'; import { FacultyPanel } from './faculty-panel'; import { FacultyService } from '../faculty-service'; -import { FacultyElm } from '../../../core/interfaces/faculty-elm'; +import { Faculty } from '../../../core/interfaces/faculty'; describe('FacultyPanel', () => { let component: FacultyPanel; @@ -12,7 +12,7 @@ describe('FacultyPanel', () => { let facultyServiceSpy: jasmine.SpyObj; let dialogSpy: jasmine.SpyObj; - const buildFaculty = (overrides: Partial = {}): FacultyElm => ({ + const buildFaculty = (overrides: Partial = {}): Faculty => ({ id: '1', facultyName: 'Faculty of Engineering', location: 'Sofia', diff --git a/uniplanWeb/src/app/features/faculty/faculty-service.ts b/uniplanWeb/src/app/features/faculty/faculty-service.ts index 9b9c05f..8587f34 100644 --- a/uniplanWeb/src/app/features/faculty/faculty-service.ts +++ b/uniplanWeb/src/app/features/faculty/faculty-service.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { inject, Injectable } from '@angular/core'; import { map, Observable, Subject } from 'rxjs'; -import { FacultyElm } from '../../core/interfaces/faculty-elm'; +import { Faculty } from '../../core/interfaces/faculty'; import {API_ENDPOINTS} from '../../config/endpoints'; @Injectable({ @@ -12,8 +12,8 @@ export class FacultyService { refreshNeeded = new Subject(); - getFaculties(): Observable { - return this.http.get(API_ENDPOINTS.faculties).pipe( + getFaculties(): Observable { + return this.http.get(API_ENDPOINTS.faculties).pipe( map((faculties) => faculties.map((faculty, index) => ({ id: faculty.id, diff --git a/uniplanWeb/src/app/features/faculty/faculty-table/faculty-table.ts b/uniplanWeb/src/app/features/faculty/faculty-table/faculty-table.ts index 4f0f85f..b49620a 100644 --- a/uniplanWeb/src/app/features/faculty/faculty-table/faculty-table.ts +++ b/uniplanWeb/src/app/features/faculty/faculty-table/faculty-table.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, signal, inject, OnInit } from '@ang import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTableModule } from '@angular/material/table'; -import { FacultyElm } from '../../../core/interfaces/faculty-elm'; +import { Faculty } from '../../../core/interfaces/faculty'; import { FacultyService } from '../faculty-service'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { FacultyEdit } from '../faculty-edit/faculty-edit'; @@ -32,7 +32,7 @@ export class FacultyTable implements OnInit { 'location', 'actions', ]; - dataSource = signal([]); + dataSource = signal([]); ngOnInit(): void { this.loadFaculties(); @@ -48,7 +48,7 @@ export class FacultyTable implements OnInit { }); } - onEdit(element: FacultyElm): void { + onEdit(element: Faculty): void { this.dialog.open(FacultyEdit, { data: { id: element.id, @@ -59,7 +59,7 @@ export class FacultyTable implements OnInit { }); } - onDelete(element: FacultyElm): void { + onDelete(element: Faculty): void { this.dialog.open(FacultyDeleteForm, { data: { id: element.id, diff --git a/uniplanWeb/src/app/features/major/major-add-form/major-add-form.ts b/uniplanWeb/src/app/features/major/major-add-form/major-add-form.ts index 291348a..90ac942 100644 --- a/uniplanWeb/src/app/features/major/major-add-form/major-add-form.ts +++ b/uniplanWeb/src/app/features/major/major-add-form/major-add-form.ts @@ -6,7 +6,7 @@ import { FormsModule } from '@angular/forms'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MajorService } from '../major-service'; -import { FacultyElm } from '../../../core/interfaces/faculty-elm'; +import { Faculty } from '../../../core/interfaces/faculty'; import { FacultyService } from '../../faculty/faculty-service'; import { TranslatePipe } from '@ngx-translate/core'; @@ -38,7 +38,7 @@ export class MajorAddForm implements OnInit { type = ''; subtype = ''; - faculties: FacultyElm[] = []; + faculties: Faculty[] = []; ngOnInit(): void { this.facultyService.getFaculties().subscribe({ diff --git a/uniplanWeb/src/app/features/major/major-edit-form/major-edit-form.ts b/uniplanWeb/src/app/features/major/major-edit-form/major-edit-form.ts index 5585a43..886e251 100644 --- a/uniplanWeb/src/app/features/major/major-edit-form/major-edit-form.ts +++ b/uniplanWeb/src/app/features/major/major-edit-form/major-edit-form.ts @@ -8,7 +8,7 @@ import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; import { MajorService } from '../major-service'; import { FacultyService } from '../../faculty/faculty-service'; -import { FacultyElm } from '../../../core/interfaces/faculty-elm'; +import { Faculty } from '../../../core/interfaces/faculty'; import { TranslatePipe } from '@ngx-translate/core'; @Component({ @@ -40,7 +40,7 @@ export class MajorEditForm implements OnInit { majorName = ''; facultyId = ''; - faculties: FacultyElm[] = []; + faculties: Faculty[] = []; constructor() { this.majorName = this.data.majorName; diff --git a/uniplanWeb/src/app/features/major/major-panel/major-panel.spec.ts b/uniplanWeb/src/app/features/major/major-panel/major-panel.spec.ts index b06a124..ea19245 100644 --- a/uniplanWeb/src/app/features/major/major-panel/major-panel.spec.ts +++ b/uniplanWeb/src/app/features/major/major-panel/major-panel.spec.ts @@ -9,8 +9,8 @@ import { MajorService } from '../major-service'; import { MajorTable } from '../major-table/major-table'; import { MajorFilters } from '../major-filters/major-filters'; import { FacultyService } from '../../faculty/faculty-service'; -import { MajorElm } from '../../../core/interfaces/major-elm'; -import { FacultyElm } from '../../../core/interfaces/faculty-elm'; +import { Major } from '../../../core/interfaces/major'; +import { Faculty } from '../../../core/interfaces/faculty'; describe('MajorPanel', () => { let component: MajorPanel; @@ -19,7 +19,7 @@ describe('MajorPanel', () => { let facultyServiceSpy: jasmine.SpyObj; let dialogSpy: jasmine.SpyObj; - const faculty: FacultyElm = { + const faculty: Faculty = { id: 'f1', facultyName: 'Faculty of Engineering', location: 'Sofia', @@ -27,7 +27,7 @@ describe('MajorPanel', () => { position: 1, }; - const major: MajorElm = { + const major: Major = { id: 'm1', courseId: 'c1', facultyId: 'f1', diff --git a/uniplanWeb/src/app/features/major/major-panel/major-panel.ts b/uniplanWeb/src/app/features/major/major-panel/major-panel.ts index 2bef305..579be08 100644 --- a/uniplanWeb/src/app/features/major/major-panel/major-panel.ts +++ b/uniplanWeb/src/app/features/major/major-panel/major-panel.ts @@ -2,7 +2,7 @@ import { Component, DestroyRef, OnInit, inject } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { catchError, combineLatest, map, merge, of, switchMap } from 'rxjs'; -import { MajorElm } from '../../../core/interfaces/major-elm'; +import { Major } from '../../../core/interfaces/major'; import { FacultyService } from '../../faculty/faculty-service'; import { MajorOptions } from '../major-options/major-options'; import { MajorFilters } from '../major-filters/major-filters'; @@ -29,7 +29,7 @@ export class MajorPanel implements OnInit { types: string[] = []; subtypes: string[] = []; - private majors: MajorElm[] = []; + private majors: Major[] = []; private facultyMap: Map = new Map(); ngOnInit(): void { diff --git a/uniplanWeb/src/app/features/major/major-service.ts b/uniplanWeb/src/app/features/major/major-service.ts index f93bdbd..84ef8bd 100644 --- a/uniplanWeb/src/app/features/major/major-service.ts +++ b/uniplanWeb/src/app/features/major/major-service.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { inject, Injectable } from '@angular/core'; import { map, Observable, Subject, switchMap } from 'rxjs'; -import { MajorElm } from '../../core/interfaces/major-elm'; +import { Major } from '../../core/interfaces/major'; import {API_ENDPOINTS} from '../../config/endpoints'; @Injectable({ @@ -12,8 +12,8 @@ export class MajorService { refreshNeeded = new Subject(); - getMajors(): Observable { - return this.http.get(API_ENDPOINTS.majors).pipe( + getMajors(): Observable { + return this.http.get(API_ENDPOINTS.majors).pipe( map((majors) => majors.map((major, index) => ({ id: major.id, @@ -87,7 +87,7 @@ export class MajorService { return this.http.delete(`${API_ENDPOINTS.courses}/${courseId}`); } - deleteMajorWithCourse(major: MajorElm): Observable { + deleteMajorWithCourse(major: Major): Observable { return this.deleteCourse(major.courseId).pipe( switchMap(() => this.deleteMajor(major.id)) ); diff --git a/uniplanWeb/src/app/features/major/major-table/major-table.ts b/uniplanWeb/src/app/features/major/major-table/major-table.ts index 29be63a..fdc0739 100644 --- a/uniplanWeb/src/app/features/major/major-table/major-table.ts +++ b/uniplanWeb/src/app/features/major/major-table/major-table.ts @@ -2,7 +2,7 @@ import { Component, Input, OnInit, ChangeDetectionStrategy, signal, inject } fro import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTableModule } from '@angular/material/table'; -import { MajorElm } from '../../../core/interfaces/major-elm'; +import { Major } from '../../../core/interfaces/major'; import { MajorFilterOptions } from '../../../core/interfaces/major-filter-options'; import { MajorEditForm } from '../major-edit-form/major-edit-form'; import { MatDialog } from '@angular/material/dialog'; @@ -32,7 +32,7 @@ export class MajorTable implements OnInit { 'actions', ]; - dataSource = signal([]); + dataSource = signal([]); facultyMap = signal(new Map()); @Input() searchText = ''; @@ -66,7 +66,7 @@ export class MajorTable implements OnInit { return this.facultyMap().get(id) || '—'; } - get filteredMajors(): MajorElm[] { + get filteredMajors(): Major[] { return this.dataSource().filter((major) => { const matchesFaculty = !this.faculty || major.facultyId === this.faculty; const matchesType = !this.type || major.courseType === this.type; @@ -80,7 +80,7 @@ export class MajorTable implements OnInit { }); } - onEdit(element: MajorElm): void { + onEdit(element: Major): void { this.dialog.open(MajorEditForm, { data: { id: element.id, @@ -90,7 +90,7 @@ export class MajorTable implements OnInit { }); } - onDelete(element: MajorElm): void { + onDelete(element: Major): void { this.dialog.open(MajorDeleteForm, { data: { id: element.id, @@ -102,7 +102,7 @@ export class MajorTable implements OnInit { } static getFilterOptions( - data: MajorElm[], + data: Major[], facultyMap: Map ): MajorFilterOptions { const faculties = [...new Set(data.map((e) => e.facultyId))].map((id) => ({ diff --git a/uniplanWeb/src/app/features/room/room-service.ts b/uniplanWeb/src/app/features/room/room-service.ts index d9c07c5..9e445b3 100644 --- a/uniplanWeb/src/app/features/room/room-service.ts +++ b/uniplanWeb/src/app/features/room/room-service.ts @@ -2,7 +2,7 @@ import { Injectable, inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { map, Observable, shareReplay } from 'rxjs'; import { RoomViewModel } from '../../core/interfaces/room-view-model'; -import { RoomElm } from '../../core/interfaces/room-elm'; +import { Room } from '../../core/interfaces/room'; @Injectable({ @@ -15,7 +15,7 @@ export class RoomService { http = inject(HttpClient); getRooms(): Observable { - return this.http.get(this.apiUrl).pipe( + return this.http.get(this.apiUrl).pipe( map(rooms => rooms ?? []), map(rooms => rooms.map((room, index) => ({ @@ -28,4 +28,4 @@ export class RoomService { shareReplay(1) ); } -} \ No newline at end of file +} diff --git a/uniplanWeb/src/app/features/student/student-panel/student-panel.ts b/uniplanWeb/src/app/features/student/student-panel/student-panel.ts index 28fd5fe..a786b98 100644 --- a/uniplanWeb/src/app/features/student/student-panel/student-panel.ts +++ b/uniplanWeb/src/app/features/student/student-panel/student-panel.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { StudentElm } from '../../../core/interfaces/student-elm'; +import { Student} from '../../../core/interfaces/student'; import { StudentOptions } from '../student-options/student-options'; import { StudentFilters } from '../student-filters/student-filters'; import { StudentTable, ELEMENT_STUDENT_DATA } from '../student-table/student-table'; @@ -19,7 +19,7 @@ export class StudentPanel implements OnInit { studentSubtypes: string[] = []; ngOnInit(): void { - const students: StudentElm[] = ELEMENT_STUDENT_DATA; + const students: Student[] = ELEMENT_STUDENT_DATA; this.studentSubtypes = StudentTable.getFilterOptions(students).subtypes; } } diff --git a/uniplanWeb/src/app/features/student/student-table/student-table.ts b/uniplanWeb/src/app/features/student/student-table/student-table.ts index f54ab97..377a2de 100644 --- a/uniplanWeb/src/app/features/student/student-table/student-table.ts +++ b/uniplanWeb/src/app/features/student/student-table/student-table.ts @@ -5,7 +5,7 @@ import { OnInit, ChangeDetectionStrategy } from '@angular/core'; -import { StudentElm } from '../../../core/interfaces/student-elm'; +import { Student } from '../../../core/interfaces/student'; import { StudentFilterOptions } from '../../../core/interfaces/student-filter-options'; import { TranslatePipe } from '@ngx-translate/core'; @@ -13,7 +13,7 @@ import { MatTableModule } from '@angular/material/table'; import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; -export const ELEMENT_STUDENT_DATA: StudentElm[] = [ +export const ELEMENT_STUDENT_DATA: Student[] = [ { position: 1, name: 'Иван Иванов', @@ -132,8 +132,8 @@ export class StudentTable implements OnInit, OnChanges { 'actions', ]; - originalData: StudentElm[] = ELEMENT_STUDENT_DATA; - dataSourceFilter: StudentElm[] = ELEMENT_STUDENT_DATA; + originalData: Student[] = ELEMENT_STUDENT_DATA; + dataSourceFilter: Student[] = ELEMENT_STUDENT_DATA; ngOnInit(): void { this.subtypes = StudentTable.getFilterOptions(this.originalData).subtypes; @@ -159,17 +159,17 @@ export class StudentTable implements OnInit, OnChanges { }); } - static getFilterOptions(data: StudentElm[]): StudentFilterOptions { + static getFilterOptions(data: Student[]): StudentFilterOptions { return { subtypes: [...new Set(data.map((e) => e.subtype))], }; } - onEdit(element: StudentElm): void { + onEdit(element: Student): void { console.log('Editing:', element); } - onDelete(element: StudentElm): void { + onDelete(element: Student): void { console.log('Deleting:', element); } } diff --git a/uniplanWeb/src/app/features/university/university-service.ts b/uniplanWeb/src/app/features/university/university-service.ts index e072b5a..0795132 100644 --- a/uniplanWeb/src/app/features/university/university-service.ts +++ b/uniplanWeb/src/app/features/university/university-service.ts @@ -3,7 +3,7 @@ import { inject, Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import {API_ENDPOINTS} from '../../config/endpoints'; -export interface UniversityElm { +export interface University { id: string; uniName: string; location: string; @@ -18,7 +18,7 @@ export interface UniversityElm { export class UniversityService { private http = inject(HttpClient); - getAllUniversities(): Observable { - return this.http.get(API_ENDPOINTS.universities); + getAllUniversities(): Observable { + return this.http.get(API_ENDPOINTS.universities); } } From cf8569c4d99a2bd5085e4d20a5046dd73d74dd17 Mon Sep 17 00:00:00 2001 From: Djesika Vacheva Date: Wed, 29 Jul 2026 11:16:41 +0300 Subject: [PATCH 2/2] Fix build errors after merge conflict resolution --- uniplanWeb/src/app/features/faculty/faculty-service.ts | 2 +- uniplanWeb/src/app/features/major/major-service.ts | 8 ++++---- .../src/app/features/room/room-add-form/room-add-form.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/uniplanWeb/src/app/features/faculty/faculty-service.ts b/uniplanWeb/src/app/features/faculty/faculty-service.ts index b4688cc..1b4fe92 100644 --- a/uniplanWeb/src/app/features/faculty/faculty-service.ts +++ b/uniplanWeb/src/app/features/faculty/faculty-service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { inject, Injectable } from '@angular/core'; -import { map, Observable, Subject } from 'rxjs'; +import { map, Observable, Subject, tap } from 'rxjs'; import { Faculty } from '../../core/interfaces/faculty'; import {API_ENDPOINTS} from '../../config/endpoints'; diff --git a/uniplanWeb/src/app/features/major/major-service.ts b/uniplanWeb/src/app/features/major/major-service.ts index 2b8e663..29d5853 100644 --- a/uniplanWeb/src/app/features/major/major-service.ts +++ b/uniplanWeb/src/app/features/major/major-service.ts @@ -32,8 +32,8 @@ export class MajorService { createMajor(createMajor: { facultyId: string; majorName: string; - }): Observable { - return this.http.post(`${API_ENDPOINTS.majors}`, createMajor).pipe( + }): Observable { + return this.http.post(`${API_ENDPOINTS.majors}`, createMajor).pipe( map((res) => { this.refreshNeeded.next(); return res; @@ -98,8 +98,8 @@ export class MajorService { editMajor( id: string, updateMajor: { facultyId: string; majorName: string } - ): Observable { - return this.http.put(`${API_ENDPOINTS.majors}/${id}`, updateMajor).pipe( + ): Observable { + return this.http.put(`${API_ENDPOINTS.majors}/${id}`, updateMajor).pipe( tap((res) => { this.refreshNeeded.next(); return res; diff --git a/uniplanWeb/src/app/features/room/room-add-form/room-add-form.ts b/uniplanWeb/src/app/features/room/room-add-form/room-add-form.ts index 0a4e4b9..1b7ad6d 100644 --- a/uniplanWeb/src/app/features/room/room-add-form/room-add-form.ts +++ b/uniplanWeb/src/app/features/room/room-add-form/room-add-form.ts @@ -11,7 +11,7 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core'; import { finalize } from 'rxjs'; import { AddForm } from '../../../core/shared/add-form/add-form'; import { FacultyService } from '../../faculty/faculty-service'; -import { FacultyElm } from '../../../core/interfaces/faculty-elm'; +import { Faculty } from '../../../core/interfaces/faculty'; import { RoomService } from '../room-service'; @Component({ @@ -36,7 +36,7 @@ export class RoomAddForm implements OnInit { private dialogRef = inject(MatDialogRef); private facultyService = inject(FacultyService); private roomService = inject(RoomService) - faculties: FacultyElm[] = []; + faculties: Faculty[] = []; private destroyRef = inject(DestroyRef); private translate = inject(TranslateService); private isSubmitting = false;