diff --git a/api/timetable/timetable.yml b/api/timetable/timetable.yaml similarity index 100% rename from api/timetable/timetable.yml rename to api/timetable/timetable.yaml diff --git a/ui/src/app/admin/admin.component.ts b/ui/src/app/admin/admin.component.ts index 4f7eb58..156d027 100644 --- a/ui/src/app/admin/admin.component.ts +++ b/ui/src/app/admin/admin.component.ts @@ -1,15 +1,15 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; +import {Title} from '@angular/platform-browser'; @Component({ selector: 'app-admin', templateUrl: './admin.component.html', - styleUrls: ['./admin.component.sass'] + styleUrls: ['./admin.component.sass'], }) export class AdminComponent implements OnInit { - - constructor() { } + constructor(private titleService: Title) {} ngOnInit(): void { + this.titleService.setTitle('Admin panel'); } - } diff --git a/ui/src/app/admin/groups-management/group-update.html b/ui/src/app/admin/groups-management/group-update.html index 5d82f2d..7395d1b 100644 --- a/ui/src/app/admin/groups-management/group-update.html +++ b/ui/src/app/admin/groups-management/group-update.html @@ -1,28 +1,28 @@ Specialisation: - - {{ spec }} + + {{ spec }} Year of education: - {{ year }} + {{ year }} Group number: - {{ num }} + {{ num }} Curator: - {{ lecturer.firstName }} {{ lecturer.lastName }} {{ lecturer.surname }} diff --git a/ui/src/app/admin/groups-management/groups-management.component.html b/ui/src/app/admin/groups-management/groups-management.component.html index f2d1fa3..9cbc00c 100644 --- a/ui/src/app/admin/groups-management/groups-management.component.html +++ b/ui/src/app/admin/groups-management/groups-management.component.html @@ -9,14 +9,14 @@ - + {{ group.specialisation }}-{{ group.yearOfEducation }}{{ group.groupNumber }} - Students in group: {{ group.students.length }} + Students in group: {{ group.students.length ? group.students.length : 0 }} diff --git a/ui/src/app/admin/groups-management/groups-management.component.ts b/ui/src/app/admin/groups-management/groups-management.component.ts index bc11c9f..bf1533b 100644 --- a/ui/src/app/admin/groups-management/groups-management.component.ts +++ b/ui/src/app/admin/groups-management/groups-management.component.ts @@ -68,9 +68,11 @@ export class GroupsManagementComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { - if (result.length) { - group.students = group.students.concat(result); - this.updateGroup(group, id); + if (result) { + if (result.length) { + group.students = group.students.concat(result); + this.updateGroup(group, id); + } } }); } @@ -137,21 +139,21 @@ export class GroupsManagementComponent implements OnInit { dialogRef.afterClosed().subscribe(result => { if (result) { - let newGroup = { + const newGroup = { specialisation: result[0], yearOfEducation: result[1], groupNumber: result[2], curator: result[3], } as Group; - const dialogRef = this.dialog.open(SelectUserDialogComponent, { + const dialogRef2 = this.dialog.open(SelectUserDialogComponent, { width: '80%', data: {query: '?role=student'}, }); - dialogRef.afterClosed().subscribe(result => { - if (result) { - newGroup.students = result; + dialogRef2.afterClosed().subscribe(result2 => { + if (result2) { + newGroup.students = result2; } this.createGroup(newGroup); }); @@ -175,6 +177,10 @@ export class GroupsManagementComponent implements OnInit { this.dataSource[id].filter = filterValue.trim().toLowerCase(); } } + + trackById(index, item) { + return item.id; + } } // ---------------------------------------select user------------------------- @@ -183,7 +189,7 @@ export class GroupsManagementComponent implements OnInit { selector: 'app-select-users-dialog', templateUrl: 'user-list.html', }) -export class SelectUserDialogComponent { +export class SelectUserDialogComponent implements OnInit { @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; users: UserAsResource[]; @@ -261,7 +267,7 @@ export class SelectUserDialogComponent { selector: 'app-update-group-dialog', templateUrl: 'group-update.html', }) -export class GroupUpdateDialogComponent { +export class GroupUpdateDialogComponent implements OnInit { @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; lecturers: UserAsResource[]; @@ -278,8 +284,8 @@ export class GroupUpdateDialogComponent { ngOnInit(): void { this.getLecturers(); this.getSpecialisations(); - this.yearsOfEducation = this.yearsOfEducation.filter(y => y != this.data.yearOfEducation); - this.groupNums = this.groupNums.filter(y => y != this.data.groupNum); + this.yearsOfEducation = this.yearsOfEducation.filter(y => y !== this.data.yearOfEducation); + this.groupNums = this.groupNums.filter(y => y !== this.data.groupNum); } getLecturers(): void { @@ -301,4 +307,8 @@ export class GroupUpdateDialogComponent { onNoClick(): void { this.dialogRef.close(); } + + trackById(index, item) { + return item.id; + } } diff --git a/ui/src/app/admin/groups-management/groups-management.service.ts b/ui/src/app/admin/groups-management/groups-management.service.ts index 49f8264..3c171dc 100644 --- a/ui/src/app/admin/groups-management/groups-management.service.ts +++ b/ui/src/app/admin/groups-management/groups-management.service.ts @@ -21,9 +21,9 @@ export class GroupsManagementService { return this.http.get(this.GroupsUrl); } - addGroups(Group: Group): Observable { + addGroups(group: Group): Observable { console.log('added'); - return this.http.post(this.GroupsUrl, Group, this.httpOptions); + return this.http.post(this.GroupsUrl, group, this.httpOptions); } updateGroup(group: Group): Observable { @@ -31,9 +31,9 @@ export class GroupsManagementService { return this.http.put(this.GroupsUrl, group, this.httpOptions); } - deleteGroups(Group: Group): Observable { + deleteGroups(group: Group): Observable { console.log('deleted'); - const url = `api/fullGroups/${Group.id}`; + const url = `api/fullGroups/${group.id}`; return this.http.delete(url, this.httpOptions); } diff --git a/ui/src/app/admin/resources-management/resources-management.component.html b/ui/src/app/admin/resources-management/resources-management.component.html index 592a214..63e1c10 100644 --- a/ui/src/app/admin/resources-management/resources-management.component.html +++ b/ui/src/app/admin/resources-management/resources-management.component.html @@ -3,7 +3,7 @@ - +
diff --git a/ui/src/app/admin/resources-management/resources-management.component.ts b/ui/src/app/admin/resources-management/resources-management.component.ts index 4f2db54..5dcc529 100644 --- a/ui/src/app/admin/resources-management/resources-management.component.ts +++ b/ui/src/app/admin/resources-management/resources-management.component.ts @@ -102,12 +102,12 @@ export class ResourcesManagementComponent implements OnInit { dialogRef.afterClosed().subscribe(result => { if (result) { newResource.resourceName = result; - const dialogRef = this.dialog.open(AddRoleDialogComponent, { + const dialogRef2 = this.dialog.open(AddRoleDialogComponent, { width: '300px', data: {message: 'Description of resource:'}, }); - dialogRef.afterClosed().subscribe(description => { + dialogRef2.afterClosed().subscribe(description => { if (description) { newResource.resourceDescription = description; } @@ -128,6 +128,10 @@ export class ResourcesManagementComponent implements OnInit { this.selectedResources.push(resource); } } + + trackById(index, item) { + return item.id; + } } @Component({ diff --git a/ui/src/app/admin/resources-management/resources.service.ts b/ui/src/app/admin/resources-management/resources.service.ts index a5999f8..c36be78 100644 --- a/ui/src/app/admin/resources-management/resources.service.ts +++ b/ui/src/app/admin/resources-management/resources.service.ts @@ -20,19 +20,19 @@ export class ResourcesService { return this.http.get(this.resourcesUrl); } - addResources(Resource: Resource): Observable { + addResources(resource: Resource): Observable { console.log('added'); - return this.http.post(this.resourcesUrl, Resource, this.httpOptions); + return this.http.post(this.resourcesUrl, resource, this.httpOptions); } - deleteResources(Resource: Resource): Observable { + deleteResources(resource: Resource): Observable { console.log('deleted'); - const url = `api/Resources/${Resource.resourceId}`; + const url = `api/Resources/${resource.resourceId}`; return this.http.delete(url, this.httpOptions); } - updateResources(Resource): Observable { + updateResources(resource): Observable { console.log('updated'); - return this.http.put(this.resourcesUrl, Resource, this.httpOptions); + return this.http.put(this.resourcesUrl, resource, this.httpOptions); } } diff --git a/ui/src/app/admin/roles/add-role.html b/ui/src/app/admin/roles/add-role.html index 9dbf7d0..c7fcbd8 100644 --- a/ui/src/app/admin/roles/add-role.html +++ b/ui/src/app/admin/roles/add-role.html @@ -1,7 +1,7 @@

{{data.message}}

- +
diff --git a/ui/src/app/admin/roles/roles.component.html b/ui/src/app/admin/roles/roles.component.html index b7247f6..f4a1d0d 100644 --- a/ui/src/app/admin/roles/roles.component.html +++ b/ui/src/app/admin/roles/roles.component.html @@ -9,7 +9,7 @@ - + {{ role.name }} @@ -34,7 +34,7 @@
-
+
{{ feature.name }}
{{ feature.description }}
DELETE diff --git a/ui/src/app/admin/roles/roles.component.ts b/ui/src/app/admin/roles/roles.component.ts index 354cd19..fa2c900 100644 --- a/ui/src/app/admin/roles/roles.component.ts +++ b/ui/src/app/admin/roles/roles.component.ts @@ -133,6 +133,10 @@ export class RolesComponent implements OnInit { } }); } + + trackById(index, item) { + return item.id; + } } @Component({ @@ -155,6 +159,10 @@ export class SelectFeatureDialogComponent { onNoClick(): void { this.dialogRef.close(); } + + trackById(index, item) { + return item.id; + } } @Component({ diff --git a/ui/src/app/admin/roles/select-feature.html b/ui/src/app/admin/roles/select-feature.html index 7b72496..152055a 100644 --- a/ui/src/app/admin/roles/select-feature.html +++ b/ui/src/app/admin/roles/select-feature.html @@ -1,7 +1,7 @@

Select new features

- + Select @@ -22,7 +22,7 @@

Select new features

Method
-
+
{{endpoint.name}}
{{endpoint.path}}
{{endpoint.method}}
diff --git a/ui/src/app/admin/users-management/users-management.component.ts b/ui/src/app/admin/users-management/users-management.component.ts index 3e1276d..eb1b083 100644 --- a/ui/src/app/admin/users-management/users-management.component.ts +++ b/ui/src/app/admin/users-management/users-management.component.ts @@ -144,11 +144,11 @@ export class UsersManagementComponent implements OnInit { } } - selectUnselectUser(User: User): void { - if (this.selectedUsers.find(u => u === User)) { - this.selectedUsers = this.selectedUsers.filter(u => u !== User); + selectUnselectUser(user: User): void { + if (this.selectedUsers.find(u => u === user)) { + this.selectedUsers = this.selectedUsers.filter(u => u !== user); } else { - this.selectedUsers.push(User); + this.selectedUsers.push(user); } } diff --git a/ui/src/app/admin/users-management/users.service.ts b/ui/src/app/admin/users-management/users.service.ts index b19db3e..67f7c46 100644 --- a/ui/src/app/admin/users-management/users.service.ts +++ b/ui/src/app/admin/users-management/users.service.ts @@ -20,14 +20,14 @@ export class UsersService { return this.http.get(`${this.UsersUrl}${query}`); } - addUsers(User: User): Observable { + addUsers(user: User): Observable { console.log('added'); - return this.http.post(this.UsersUrl, User, this.httpOptions); + return this.http.post(this.UsersUrl, user, this.httpOptions); } - deleteUsers(User: User): Observable { + deleteUsers(user: User): Observable { console.log('deleted'); - const url = `api/fullUsers/${User.userId}`; + const url = `api/fullUsers/${user.userId}`; return this.http.delete(url, this.httpOptions); } } diff --git a/ui/src/app/error-page/error-page.component.ts b/ui/src/app/error-page/error-page.component.ts index 10d1cb0..e62ccdf 100644 --- a/ui/src/app/error-page/error-page.component.ts +++ b/ui/src/app/error-page/error-page.component.ts @@ -1,15 +1,15 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; +import {Title} from '@angular/platform-browser'; @Component({ selector: 'app-error-page', templateUrl: './error-page.component.html', - styleUrls: ['./error-page.component.sass'] + styleUrls: ['./error-page.component.sass'], }) export class ErrorPageComponent implements OnInit { - - constructor() { } + constructor(private titleService: Title) {} ngOnInit(): void { + this.titleService.setTitle('Oops, something went wrong'); } - } diff --git a/ui/src/app/landing-page/landing-page.component.ts b/ui/src/app/landing-page/landing-page.component.ts index 9116e13..d68bd0d 100644 --- a/ui/src/app/landing-page/landing-page.component.ts +++ b/ui/src/app/landing-page/landing-page.component.ts @@ -1,15 +1,30 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; +import {Title} from '@angular/platform-browser'; +import {Meta} from '@angular/platform-browser'; @Component({ selector: 'app-landing-page', templateUrl: './landing-page.component.html', - styleUrls: ['./landing-page.component.sass'] + styleUrls: ['./landing-page.component.sass'], }) export class LandingPageComponent implements OnInit { - - constructor() { } + constructor(private titleService: Title, private meta: Meta) {} ngOnInit(): void { + this.titleService.setTitle('OMC college'); + this.meta.updateTag({ + name: 'description', + content: + 'Welcome to Optical and Mechanical College, \ + here you can read information about studying \ + and articles about interesting inventions of our students \ + and other their achievements and watch college`s life.', + }); + this.meta.updateTag({ + name: 'keywords', + content: + 'OMC college, student life, student news, education, studying, \ + college, Taras Shevchenko University, programming, economy, physics, journalism', + }); } - } diff --git a/ui/src/app/models/Lesson.ts b/ui/src/app/models/Lesson.ts index b743fb2..fe0deb0 100644 --- a/ui/src/app/models/Lesson.ts +++ b/ui/src/app/models/Lesson.ts @@ -2,10 +2,10 @@ import * as moment from 'moment'; import {GroupAsResource} from './GroupAsResource'; import {UserAsResource} from './UserAsResource'; import {Room} from './Room'; -import {iSubject} from './Subject'; +import {SubjectInterface} from './Subject'; export interface Lesson { readonly id: string; - subject: iSubject; + subject: SubjectInterface; lecturer: UserAsResource; group: GroupAsResource; startAt: moment.Moment; diff --git a/ui/src/app/models/Subject.ts b/ui/src/app/models/Subject.ts index bd395df..a61582e 100644 --- a/ui/src/app/models/Subject.ts +++ b/ui/src/app/models/Subject.ts @@ -1,4 +1,4 @@ -export interface iSubject { +export interface SubjectInterface { id: string; nameOfSubject: string; } diff --git a/ui/src/app/models/signIn.ts b/ui/src/app/models/signIn.ts index 5a9276a..2c6e501 100644 --- a/ui/src/app/models/signIn.ts +++ b/ui/src/app/models/signIn.ts @@ -1,4 +1,5 @@ export interface SignIn { login: string; password: string; + isRememberMe: boolean; } diff --git a/ui/src/app/sign-in/autorization.service.spec.ts b/ui/src/app/sign-in/authorization.service.spec.ts similarity index 100% rename from ui/src/app/sign-in/autorization.service.spec.ts rename to ui/src/app/sign-in/authorization.service.spec.ts diff --git a/ui/src/app/sign-in/autorisation.service.spec.ts b/ui/src/app/sign-in/autorisation.service.spec.ts deleted file mode 100644 index b4d9792..0000000 --- a/ui/src/app/sign-in/autorisation.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AutorisationService } from './autorisation.service'; - -describe('AutorisationService', () => { - let service: AutorisationService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AutorisationService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/ui/src/app/sign-in/autorisation.service.ts b/ui/src/app/sign-in/autorisation.service.ts deleted file mode 100644 index 749f5e7..0000000 --- a/ui/src/app/sign-in/autorisation.service.ts +++ /dev/null @@ -1,25 +0,0 @@ -import {Injectable} from '@angular/core'; -import {HttpClient, HttpHeaders} from '@angular/common/http'; -import {Observable} from 'rxjs'; - -import {SignIn} from '../models/signIn'; -@Injectable({ - providedIn: 'root', -}) -export class AutorisationService { - httpOptions = { - headers: new HttpHeaders({'Content-Type': 'application/json'}), - }; - - constructor(private http: HttpClient) {} - - signIn(value: SignIn): Observable { - console.log('sign in'); - return this.http.post('api/signIn', value, this.httpOptions); - } - - signUp(value): Observable { - console.log('sign up'); - return this.http.post('api/signUp', value, this.httpOptions); - } -} diff --git a/ui/src/app/sign-in/sign-in.module.ts b/ui/src/app/sign-in/sign-in.module.ts index f0d6458..1f27c1f 100644 --- a/ui/src/app/sign-in/sign-in.module.ts +++ b/ui/src/app/sign-in/sign-in.module.ts @@ -14,6 +14,7 @@ import {MatSelectModule} from '@angular/material/select'; import {MatIconModule} from '@angular/material/icon'; import {MatToolbarModule} from '@angular/material/toolbar'; import {MatStepperModule} from '@angular/material/stepper'; +import {MatCheckboxModule} from '@angular/material/checkbox'; @NgModule({ declarations: [SignInComponent], imports: [ @@ -30,6 +31,7 @@ import {MatStepperModule} from '@angular/material/stepper'; MatIconModule, MatToolbarModule, MatStepperModule, + MatCheckboxModule, ], exports: [ SignInComponent, @@ -43,6 +45,7 @@ import {MatStepperModule} from '@angular/material/stepper'; MatIconModule, MatToolbarModule, MatStepperModule, + MatCheckboxModule, ], }) export class SignInModule {} diff --git a/ui/src/app/sign-in/sign-in/sign-in.component.html b/ui/src/app/sign-in/sign-in/sign-in.component.html index 98bdf81..ccb3ab0 100644 --- a/ui/src/app/sign-in/sign-in/sign-in.component.html +++ b/ui/src/app/sign-in/sign-in/sign-in.component.html @@ -4,8 +4,9 @@ - Not more then 60 characters long. + Not more then 64 characters long. Login is required + You have less than 8 characters You have more than 60 characters @@ -28,13 +29,15 @@ {{ hide ? 'visibility_off' : 'visibility' }} - Not more then 255 characters long. + Not more then 64 characters long. Password is required - You have more than 255 characters + You have less than 8 characters + You have more than 64 characters + Remember me
+
+

Forgot password?

+
diff --git a/ui/src/app/sign-in/sign-in/sign-in.component.sass b/ui/src/app/sign-in/sign-in/sign-in.component.sass index b198f67..db4a0fe 100644 --- a/ui/src/app/sign-in/sign-in/sign-in.component.sass +++ b/ui/src/app/sign-in/sign-in/sign-in.component.sass @@ -43,4 +43,6 @@ mat-form-field, mat-card-actions, mat-card-content, mat-horizontal-stepper, .hin cursor: pointer transition: 0.2s linear &:hover - color: #3f51b5 \ No newline at end of file + color: #3f51b5 +.rememberMe + margin-left: 8px \ No newline at end of file diff --git a/ui/src/app/sign-in/sign-in/sign-in.component.ts b/ui/src/app/sign-in/sign-in/sign-in.component.ts index 9bf98de..f527f40 100644 --- a/ui/src/app/sign-in/sign-in/sign-in.component.ts +++ b/ui/src/app/sign-in/sign-in/sign-in.component.ts @@ -2,6 +2,8 @@ import {Component, OnInit} from '@angular/core'; import {FormControl, FormGroup, Validators} from '@angular/forms'; import {AuthorizationService} from '../authorization.service'; import {SignIn} from '../../models/signIn'; +import {Title} from '@angular/platform-browser'; +import {Meta} from '@angular/platform-browser'; @Component({ selector: 'app-sign-in', @@ -10,23 +12,18 @@ import {SignIn} from '../../models/signIn'; }) export class SignInComponent implements OnInit { signInForm: FormGroup; - signUpForm: FormGroup; - showSignUp = false; hide = true; - constructor(private authorisationService: AuthorizationService) {} + constructor(private authorisationService: AuthorizationService, private titleService: Title, private meta: Meta) {} ngOnInit(): void { + this.titleService.setTitle('Authentication'); + this.meta.updateTag({name: 'description', content: 'Sign in/up to OMC learning management system'}); + this.signInForm = new FormGroup({ - login: new FormControl('', [Validators.required, Validators.maxLength(60)]), - password: new FormControl('', [Validators.required, Validators.maxLength(255)]), - }); - this.signUpForm = new FormGroup({ - firstName: new FormControl('', [Validators.required, Validators.maxLength(255)]), - lastname: new FormControl('', [Validators.required, Validators.maxLength(255)]), - surname: new FormControl('', [Validators.required, Validators.maxLength(255)]), - email: new FormControl('', [Validators.required, Validators.maxLength(60)]), - password: new FormControl('', [Validators.required, Validators.maxLength(255)]), + login: new FormControl('', [Validators.required, Validators.minLength(8), Validators.maxLength(64)]), + password: new FormControl('', [Validators.required, Validators.minLength(8), Validators.maxLength(64)]), + isRememberMe: new FormControl(''), }); } @@ -35,13 +32,14 @@ export class SignInComponent implements OnInit { const signInValue: SignIn = { login: value.login, password: value.password, + isRememberMe: value.isRememberMe, }; this.executeSignIn(signInValue); } } private executeSignIn(value: SignIn) { - this.authorisationService.signIn(value).subscribe(request => console.log(request)); + this.authorisationService.signIn(value).subscribe(); } hasSignInError(controlName: string, errorName: string) { diff --git a/ui/src/app/timetable/calendar/calendar.component.ts b/ui/src/app/timetable/calendar/calendar.component.ts index f44893d..a484a8d 100644 --- a/ui/src/app/timetable/calendar/calendar.component.ts +++ b/ui/src/app/timetable/calendar/calendar.component.ts @@ -9,7 +9,7 @@ import {MatCalendar} from '@angular/material/datepicker'; styleUrls: ['./calendar.component.sass'], }) export class CalendarComponent implements OnInit { - selectedDate: Date = new Date(); // date which is chosen at this moment + selectedDate: Date = new Date(); @ViewChild(MatCalendar) calendar: MatCalendar; diff --git a/ui/src/app/timetable/header/header.component.html b/ui/src/app/timetable/header/header.component.html index f23be17..02da2e9 100644 --- a/ui/src/app/timetable/header/header.component.html +++ b/ui/src/app/timetable/header/header.component.html @@ -15,10 +15,7 @@ - - diff --git a/ui/src/app/timetable/in-memory-data.service.ts b/ui/src/app/timetable/in-memory-data.service.ts index 2a17ed5..0430141 100644 --- a/ui/src/app/timetable/in-memory-data.service.ts +++ b/ui/src/app/timetable/in-memory-data.service.ts @@ -5,7 +5,7 @@ import * as moment from 'moment'; import {Lesson} from '../models/Lesson'; import {GroupAsResource} from '../models/GroupAsResource'; import {Room} from '../models/Room'; -import {iSubject} from '../models/Subject'; +import {SubjectInterface} from '../models/Subject'; import {UserAsResource} from '../models/UserAsResource'; import {Role, FeatureEntry, Endpoint} from '../models/role'; import {Resource} from '../models/Resource'; @@ -580,7 +580,7 @@ export class InMemoryDataService implements InMemoryDbService { room: '4', }, ]; - const subjects: iSubject[] = [ + const subjects: SubjectInterface[] = [ { id: '11', nameOfSubject: 'Programming', diff --git a/ui/src/app/timetable/schedule/schedule.component.html b/ui/src/app/timetable/schedule/schedule.component.html index 657928c..8b904ce 100644 --- a/ui/src/app/timetable/schedule/schedule.component.html +++ b/ui/src/app/timetable/schedule/schedule.component.html @@ -3,28 +3,18 @@
-
+

{{ timestamp }}

-
-

M

-
+

M

T

W

T

F

-
-

S

- - -
+

S

@@ -36,15 +26,15 @@ card.date() === selectedDate.date() " (click)="showAddLessonComponent(card); drawer.open()" - *ngFor="let card of cards" + *ngFor="let card of cards; trackBy: trackById" >
- + {{ lesson.subject.nameOfSubject }} @@ -25,28 +25,30 @@ Subject - {{ subject.nameOfSubject }} + {{ + subject.nameOfSubject + }} Room - {{ room.room }} + {{ room.room }} Group - {{ group.name }} + {{ group.name }} Lecturer - {{ lecturer.firstName }} {{ lecturer.lastName }} diff --git a/ui/src/app/timetable/search-result/search-result.component.ts b/ui/src/app/timetable/search-result/search-result.component.ts index 7ea88da..fda69e4 100644 --- a/ui/src/app/timetable/search-result/search-result.component.ts +++ b/ui/src/app/timetable/search-result/search-result.component.ts @@ -4,7 +4,7 @@ import {TimetableHttpService} from '../shared/timetable-http.service'; import {GroupAsResource} from '../../models/GroupAsResource'; import {UserAsResource} from '../../models/UserAsResource'; -import {iSubject} from '../../models/Subject'; +import {SubjectInterface} from '../../models/Subject'; import {Room} from '../../models/Room'; @Component({ selector: 'app-search-result', @@ -18,7 +18,7 @@ export class SearchResultComponent implements OnInit { private usersUrl = 'api/users'; groups: GroupAsResource[] = []; lecturers: UserAsResource[] = []; - subjects: iSubject[] = []; + subjects: SubjectInterface[] = []; rooms: Room[] = []; constructor( private timetableHttpService: TimetableHttpService, @@ -43,11 +43,17 @@ export class SearchResultComponent implements OnInit { this.lecturers = lecturers; }); } + dateFilter(d: Date | null): boolean { const day = (d || new Date()).getDay(); return day !== 0; } + close(): void { this.dialogRef.close(); } + + trackById(index: number, el: any): number { + return el.id; + } } diff --git a/ui/src/app/timetable/sidebar/sidebar.component.html b/ui/src/app/timetable/sidebar/sidebar.component.html index 6ac967b..e03a202 100644 --- a/ui/src/app/timetable/sidebar/sidebar.component.html +++ b/ui/src/app/timetable/sidebar/sidebar.component.html @@ -4,28 +4,30 @@ Subject - {{ subject.nameOfSubject }} + {{ + subject.nameOfSubject + }} Room - {{ room.room }} + {{ room.room }} Group - {{ group.name }} + {{ group.name }} Lecturer - {{ lecturer.firstName }} {{ lecturer.lastName }} diff --git a/ui/src/app/timetable/sidebar/sidebar.component.ts b/ui/src/app/timetable/sidebar/sidebar.component.ts index f7ecb4b..427ee8b 100644 --- a/ui/src/app/timetable/sidebar/sidebar.component.ts +++ b/ui/src/app/timetable/sidebar/sidebar.component.ts @@ -8,7 +8,7 @@ import {SearchResultComponent} from '../search-result/search-result.component'; import {GroupAsResource} from '../../models/GroupAsResource'; import {UserAsResource} from '../../models/UserAsResource'; -import {iSubject} from '../../models/Subject'; +import {SubjectInterface} from '../../models/Subject'; import {Room} from '../../models/Room'; import {Error} from '../../models/Error'; @@ -29,7 +29,7 @@ export class SidebarComponent implements OnInit { groups: GroupAsResource[] = []; lecturers: UserAsResource[] = []; - subjects: iSubject[] = []; + subjects: SubjectInterface[] = []; rooms: Room[] = []; constructor( private timetableHttpService: TimetableHttpService, @@ -109,14 +109,18 @@ export class SidebarComponent implements OnInit { query += `&lecturerid=${filters.lecturerFormControl.id}`; } if (filters.startDateFormControl && query.length === 1) { - query += `datefrom=${filters.startDateFormControl.getFullYear()}-${filters.startDateFormControl.getMonth()}-${filters.startDateFormControl.getDate()}`; + query += `datefrom=${filters.startDateFormControl.getFullYear()}-\ + ${filters.startDateFormControl.getMonth()}-${filters.startDateFormControl.getDate()}`; } else if (filters.startDateFormControl) { - query += `&datefrom=${filters.startDateFormControl.getFullYear()}-${filters.startDateFormControl.getMonth()}-${filters.startDateFormControl.getDate()}`; + query += `&datefrom=${filters.startDateFormControl.getFullYear()}-\ + ${filters.startDateFormControl.getMonth()}-${filters.startDateFormControl.getDate()}`; } if (filters.endDateFormControl && query.length === 1) { - query += `dateto=${filters.endDateFormControl.getFullYear()}-${filters.endDateFormControl.getMonth()}-${filters.endDateFormControl.getDate()}`; + query += `dateto=${filters.endDateFormControl.getFullYear()}-\ + ${filters.endDateFormControl.getMonth()}-${filters.endDateFormControl.getDate()}`; } else if (filters.endDateFormControl) { - query += `&dateto=${filters.endDateFormControl.getFullYear()}-${filters.endDateFormControl.getMonth()}-${filters.endDateFormControl.getDate()}`; + query += `&dateto=${filters.endDateFormControl.getFullYear()}-\ + ${filters.endDateFormControl.getMonth()}-${filters.endDateFormControl.getDate()}`; } if (filters.startTimeFormControl && query.length === 1) { query += `timefrom=${filters.startTimeFormControl}`; @@ -156,6 +160,10 @@ export class SidebarComponent implements OnInit { this.showProgressBar = !this.showProgressBar; this.timetableService.changeProgressBarState(this.showProgressBar); } + + trackById(index: number, el: any): number { + return el.id; + } } @Component({ diff --git a/ui/src/app/timetable/slider-menu/delete-dialog.html b/ui/src/app/timetable/slider-menu/delete-dialog.html index 050975d..7b8ff18 100644 --- a/ui/src/app/timetable/slider-menu/delete-dialog.html +++ b/ui/src/app/timetable/slider-menu/delete-dialog.html @@ -1,7 +1,9 @@

Are you sure?

- {{data.isDelete? 'Yes': 'No'}} + {{data.isDelete? 'Yes': 'No'}}