From ce80f004832004f3d7f971bfcae990abf6d9390f Mon Sep 17 00:00:00 2001 From: Nada257 Date: Wed, 2 Nov 2022 23:49:40 +0200 Subject: [PATCH 1/8] integrate emplyee with backend --- ui/config/development.json | 2 +- .../Pages/employee/employee.component.html | 182 +++++++++++------- .../app/Pages/employee/employee.component.ts | 91 +++++++-- .../core/services/config/message.service.ts | 3 + .../domain/employee/employee.repository.ts | 15 ++ ui/src/app/domain/employee/model/Emplyee.ts | 6 + ui/src/main.ts | 2 +- 7 files changed, 217 insertions(+), 84 deletions(-) create mode 100644 ui/src/app/domain/employee/employee.repository.ts create mode 100644 ui/src/app/domain/employee/model/Emplyee.ts diff --git a/ui/config/development.json b/ui/config/development.json index f939da9c..b3539b91 100644 --- a/ui/config/development.json +++ b/ui/config/development.json @@ -1,6 +1,6 @@ { "api": { - "baseUrl": "http://41.38.83.137:8080/" + "baseUrl": "http://41.65.11.55:8080/" }, diff --git a/ui/src/app/Pages/employee/employee.component.html b/ui/src/app/Pages/employee/employee.component.html index b9a4e66d..5f966e58 100644 --- a/ui/src/app/Pages/employee/employee.component.html +++ b/ui/src/app/Pages/employee/employee.component.html @@ -1,78 +1,122 @@
-
+
+

All Employees

+
+ + + + + -

All Employees -

-
-
No.{{ i + 1 }}
- - - - - - - - - + + + + + + + + + + + + + + +
No. Name Name{{ element.name }} + edit + + person_remove +
+
+
+ +
+
+
+

- - - -
-
- -
- +

-

- -
-
-
-
-
-
-
- Employee Info -
-
- - Employee Name - - - Please enter a Employee Name - - - Employee Name is required - - -
- - - -
- - Choose Company - - Side - Over - Push - - - -
- - - -
- -
-
+
+
+
+ + +
+ Employee Info +
+
+ + Employee Name + + + Please enter a Employee Name + + + Employee Name is required + + +
-
+
+ + Choose Company + + Side + Over + Push + + +
- -
+
+ +
+
+ + + diff --git a/ui/src/app/Pages/employee/employee.component.ts b/ui/src/app/Pages/employee/employee.component.ts index 1460e0f9..7c734175 100644 --- a/ui/src/app/Pages/employee/employee.component.ts +++ b/ui/src/app/Pages/employee/employee.component.ts @@ -1,29 +1,94 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { PageEvent } from '@angular/material/paginator'; +import { BehaviorSubject, switchMap } from 'rxjs'; +import { MessageService } from 'src/app/core/services/config/message.service'; +import { EmployeeRepository } from 'src/app/domain/employee/employee.repository'; +import { Emplyee } from 'src/app/domain/employee/model/Emplyee'; @Component({ selector: 'app-employee', - templateUrl: './employee.component.html' + templateUrl: './employee.component.html', }) export class EmployeeComponent implements OnInit { - employeeForm!:FormGroup; - displayedColumns: string[] = ['Question', 'description']; - isVisible:boolean = false; - constructor(private formBuilder:FormBuilder) { } + employeeForm!: FormGroup; + displayedColumns: string[] = ['id','name','delete','update']; + isVisible: boolean = false; + page: number = 0; + size: number = 10; + totalItems: number = 0; + allEmployees: Emplyee[] = []; + isRestButtonAppear: boolean; + + constructor( + private formBuilder: FormBuilder, + private _EmployeeRepository: EmployeeRepository, + private message: MessageService + ) {} ngOnInit(): void { this.employForm(); + this.getAllEmplyees(); + } + employForm() { + this.employeeForm = this.formBuilder.group({ + id: [''], + name: ['', [Validators.required]], + companyId: ['', [Validators.required]], + }); + } + SaveData(){ + if(this.employeeForm.valid){ + this.employeeForm.controls['id'].value? this.updateEmployee():this.addEmployee(); + this.employeeForm.reset(); } - employForm(){ - this.employeeForm=this.formBuilder.group({ - id:[''], - name:['', [Validators.required]], - companyId:['', [Validators.required]] + } + addEmployee(){ + this._EmployeeRepository.update(this.employeeForm.value).subscribe(()=>{ + this.getAllEmplyees();this.changeVisibility(); }) } - onSubmit(){ + getAllEmplyees(): void { + this._EmployeeRepository + .getList({ + page: this.page, + size: this.size, + }) + .subscribe((result) => { + this.allEmployees = result.data; + this.totalItems = result.pagination.itemCount; + console.log(result) + }); + } + fetchData(employeeData:Emplyee):void{ + this.employeeForm.reset(); + this.isVisible=true; + + this.employeeForm.patchValue({ + id:employeeData.id, + name:employeeData.name + + }) } - changeVisibility(){ - this.isVisible = !this.isVisible + updateEmployee(){ + this._EmployeeRepository.update(this.employeeForm.value).subscribe(()=>{ + this.getAllEmplyees(); + this.changeVisibility(); + }) + } + deleteEmployee(employeeData:Emplyee){ + this.message.deleteConfirmation('','Are you sure want to delete this employee ? ').subscribe(res =>{ + if(res.success) + this._EmployeeRepository.delete(employeeData.id).subscribe(()=>{ + this.getAllEmplyees(); + }) + }) + } + onSubmit() {} + changeVisibility() { + this.isVisible = !this.isVisible; + } + appearRest() { + this.isRestButtonAppear = true; } } diff --git a/ui/src/app/core/services/config/message.service.ts b/ui/src/app/core/services/config/message.service.ts index 7d5813ef..54c10128 100644 --- a/ui/src/app/core/services/config/message.service.ts +++ b/ui/src/app/core/services/config/message.service.ts @@ -8,6 +8,9 @@ import { Observable } from 'rxjs'; providedIn: 'root' }) export class MessageService { + delete(id: number) { + throw new Error('Method not implemented.'); + } errorMessage = (errorText: string): void => { this.toast.error(errorText) }; diff --git a/ui/src/app/domain/employee/employee.repository.ts b/ui/src/app/domain/employee/employee.repository.ts new file mode 100644 index 00000000..fe76a1a5 --- /dev/null +++ b/ui/src/app/domain/employee/employee.repository.ts @@ -0,0 +1,15 @@ +import { HttpClient } from "@angular/common/http"; +import { Injectable } from "@angular/core"; +import { ResourceService } from "src/app/core/services/config/resource.service"; +import { Emplyee } from "./model/Emplyee"; +@Injectable({ + providedIn: 'root' + }) + +export class EmployeeRepository extends ResourceService{ + constructor(httpClient: HttpClient) { + super(httpClient); + } + getResourceUrl(): string { + return 'employee'; + }} \ No newline at end of file diff --git a/ui/src/app/domain/employee/model/Emplyee.ts b/ui/src/app/domain/employee/model/Emplyee.ts new file mode 100644 index 00000000..33612351 --- /dev/null +++ b/ui/src/app/domain/employee/model/Emplyee.ts @@ -0,0 +1,6 @@ +export interface Emplyee{ + id:number; + name:string; + description:string; + } + \ No newline at end of file diff --git a/ui/src/main.ts b/ui/src/main.ts index c7b673cf..22d6e1fd 100644 --- a/ui/src/main.ts +++ b/ui/src/main.ts @@ -1,6 +1,5 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; @@ -10,3 +9,4 @@ if (environment.production) { platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.error(err)); + From 106b12f916b3df2999ed02d2cb3bfd5af0d7d684 Mon Sep 17 00:00:00 2001 From: Nada257 Date: Sun, 6 Nov 2022 13:15:43 +0200 Subject: [PATCH 2/8] (del un need fun,line) (edit update function) --- ui/src/app/Pages/company/company.component.ts | 4 ++-- ui/src/app/Pages/employee/employee.component.ts | 14 +++++--------- ui/src/app/domain/employee/employee.repository.ts | 2 +- ui/src/app/domain/employee/model/Emplyee.ts | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/ui/src/app/Pages/company/company.component.ts b/ui/src/app/Pages/company/company.component.ts index ac9f5b64..aa2779d6 100644 --- a/ui/src/app/Pages/company/company.component.ts +++ b/ui/src/app/Pages/company/company.component.ts @@ -22,14 +22,14 @@ export class CompanyComponent implements OnInit { page: number = 0; totalItems: number = 0; - constructor(private formBuilder: FormBuilder, private companyRepository: CompanyRepository,private message: MessageService) { } + constructor(private FormBuilder: FormBuilder, private companyRepository: CompanyRepository,private message: MessageService) { } ngOnInit(): void { this.compForm(); this.getAllCompanies(); } compForm() { - this.companyForm = this.formBuilder.group({ + this.companyForm = this.FormBuilder.group({ id: [''], name: ['', [Validators.required]], description: ['', [Validators.required]] diff --git a/ui/src/app/Pages/employee/employee.component.ts b/ui/src/app/Pages/employee/employee.component.ts index 7c734175..8b8781df 100644 --- a/ui/src/app/Pages/employee/employee.component.ts +++ b/ui/src/app/Pages/employee/employee.component.ts @@ -4,7 +4,7 @@ import { PageEvent } from '@angular/material/paginator'; import { BehaviorSubject, switchMap } from 'rxjs'; import { MessageService } from 'src/app/core/services/config/message.service'; import { EmployeeRepository } from 'src/app/domain/employee/employee.repository'; -import { Emplyee } from 'src/app/domain/employee/model/Emplyee'; +import { emplyee } from 'src/app/domain/employee/model/emplyee'; @Component({ selector: 'app-employee', @@ -17,7 +17,7 @@ export class EmployeeComponent implements OnInit { page: number = 0; size: number = 10; totalItems: number = 0; - allEmployees: Emplyee[] = []; + allEmployees: emplyee[] = []; isRestButtonAppear: boolean; constructor( @@ -56,10 +56,9 @@ export class EmployeeComponent implements OnInit { .subscribe((result) => { this.allEmployees = result.data; this.totalItems = result.pagination.itemCount; - console.log(result) }); } - fetchData(employeeData:Emplyee):void{ + fetchData(employeeData:emplyee):void{ this.employeeForm.reset(); this.isVisible=true; @@ -76,7 +75,7 @@ export class EmployeeComponent implements OnInit { this.changeVisibility(); }) } - deleteEmployee(employeeData:Emplyee){ + deleteEmployee(employeeData:emplyee){ this.message.deleteConfirmation('','Are you sure want to delete this employee ? ').subscribe(res =>{ if(res.success) this._EmployeeRepository.delete(employeeData.id).subscribe(()=>{ @@ -84,11 +83,8 @@ export class EmployeeComponent implements OnInit { }) }) } - onSubmit() {} changeVisibility() { this.isVisible = !this.isVisible; } - appearRest() { - this.isRestButtonAppear = true; - } + } diff --git a/ui/src/app/domain/employee/employee.repository.ts b/ui/src/app/domain/employee/employee.repository.ts index fe76a1a5..7959b1c0 100644 --- a/ui/src/app/domain/employee/employee.repository.ts +++ b/ui/src/app/domain/employee/employee.repository.ts @@ -1,7 +1,7 @@ import { HttpClient } from "@angular/common/http"; import { Injectable } from "@angular/core"; import { ResourceService } from "src/app/core/services/config/resource.service"; -import { Emplyee } from "./model/Emplyee"; +import { Emplyee } from "./model/emplyee"; @Injectable({ providedIn: 'root' }) diff --git a/ui/src/app/domain/employee/model/Emplyee.ts b/ui/src/app/domain/employee/model/Emplyee.ts index 33612351..537a5ed5 100644 --- a/ui/src/app/domain/employee/model/Emplyee.ts +++ b/ui/src/app/domain/employee/model/Emplyee.ts @@ -1,6 +1,6 @@ -export interface Emplyee{ +export interface emplyee{ id:number; name:string; - description:string; + } \ No newline at end of file From 7173c603d716f6fc335bb932028d5a9c9f1c5cea Mon Sep 17 00:00:00 2001 From: Nada257 Date: Sun, 6 Nov 2022 13:18:37 +0200 Subject: [PATCH 3/8] edit name to be cammel Case --- ui/src/app/Pages/employee/employee.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/src/app/Pages/employee/employee.component.ts b/ui/src/app/Pages/employee/employee.component.ts index 8b8781df..9472e98f 100644 --- a/ui/src/app/Pages/employee/employee.component.ts +++ b/ui/src/app/Pages/employee/employee.component.ts @@ -22,7 +22,7 @@ export class EmployeeComponent implements OnInit { constructor( private formBuilder: FormBuilder, - private _EmployeeRepository: EmployeeRepository, + private employeeRepository: EmployeeRepository, private message: MessageService ) {} ngOnInit(): void { @@ -43,12 +43,12 @@ export class EmployeeComponent implements OnInit { } } addEmployee(){ - this._EmployeeRepository.update(this.employeeForm.value).subscribe(()=>{ + this.employeeRepository.add(this.employeeForm.value).subscribe(()=>{ this.getAllEmplyees();this.changeVisibility(); }) } getAllEmplyees(): void { - this._EmployeeRepository + this.employeeRepository .getList({ page: this.page, size: this.size, @@ -70,7 +70,7 @@ export class EmployeeComponent implements OnInit { } updateEmployee(){ - this._EmployeeRepository.update(this.employeeForm.value).subscribe(()=>{ + this.employeeRepository.update(this.employeeForm.value).subscribe(()=>{ this.getAllEmplyees(); this.changeVisibility(); }) @@ -78,7 +78,7 @@ export class EmployeeComponent implements OnInit { deleteEmployee(employeeData:emplyee){ this.message.deleteConfirmation('','Are you sure want to delete this employee ? ').subscribe(res =>{ if(res.success) - this._EmployeeRepository.delete(employeeData.id).subscribe(()=>{ + this.employeeRepository.delete(employeeData.id).subscribe(()=>{ this.getAllEmplyees(); }) }) From 99bd841fdff18a23732478f7a8d40bda66f2087f Mon Sep 17 00:00:00 2001 From: Nada257 Date: Mon, 7 Nov 2022 12:05:22 +0200 Subject: [PATCH 4/8] adding company names , fix employee component --- ui/src/app/Pages/employee/employee.component.html | 5 ++--- ui/src/app/domain/employee/employee.repository.ts | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/src/app/Pages/employee/employee.component.html b/ui/src/app/Pages/employee/employee.component.html index 5f966e58..21257c90 100644 --- a/ui/src/app/Pages/employee/employee.component.html +++ b/ui/src/app/Pages/employee/employee.component.html @@ -95,9 +95,8 @@

All Employees

Choose Company - Side - Over - Push + Education + Government diff --git a/ui/src/app/domain/employee/employee.repository.ts b/ui/src/app/domain/employee/employee.repository.ts index 7959b1c0..430700b8 100644 --- a/ui/src/app/domain/employee/employee.repository.ts +++ b/ui/src/app/domain/employee/employee.repository.ts @@ -1,12 +1,12 @@ import { HttpClient } from "@angular/common/http"; import { Injectable } from "@angular/core"; import { ResourceService } from "src/app/core/services/config/resource.service"; -import { Emplyee } from "./model/emplyee"; +import { emplyee } from "./model/emplyee"; @Injectable({ providedIn: 'root' }) -export class EmployeeRepository extends ResourceService{ +export class EmployeeRepository extends ResourceService{ constructor(httpClient: HttpClient) { super(httpClient); } From 0c845679e42e0ba2548556198786e0f7de101cfb Mon Sep 17 00:00:00 2001 From: Nada257 Date: Mon, 7 Nov 2022 14:49:38 +0200 Subject: [PATCH 5/8] addingcompany --- ui/src/app/Pages/company/company.component.ts | 4 +-- .../Pages/employee/employee.component.html | 9 ++++--- .../app/Pages/employee/employee.component.ts | 27 ++++++++++++++----- ui/src/app/domain/company/models/company.ts | 2 ++ .../domain/employee/employee.repository.ts | 2 +- ui/src/app/domain/employee/model/Emplyee.ts | 6 ----- ui/src/app/domain/employee/models/emplyee.ts | 9 +++++++ 7 files changed, 39 insertions(+), 20 deletions(-) delete mode 100644 ui/src/app/domain/employee/model/Emplyee.ts create mode 100644 ui/src/app/domain/employee/models/emplyee.ts diff --git a/ui/src/app/Pages/company/company.component.ts b/ui/src/app/Pages/company/company.component.ts index aa2779d6..ac9f5b64 100644 --- a/ui/src/app/Pages/company/company.component.ts +++ b/ui/src/app/Pages/company/company.component.ts @@ -22,14 +22,14 @@ export class CompanyComponent implements OnInit { page: number = 0; totalItems: number = 0; - constructor(private FormBuilder: FormBuilder, private companyRepository: CompanyRepository,private message: MessageService) { } + constructor(private formBuilder: FormBuilder, private companyRepository: CompanyRepository,private message: MessageService) { } ngOnInit(): void { this.compForm(); this.getAllCompanies(); } compForm() { - this.companyForm = this.FormBuilder.group({ + this.companyForm = this.formBuilder.group({ id: [''], name: ['', [Validators.required]], description: ['', [Validators.required]] diff --git a/ui/src/app/Pages/employee/employee.component.html b/ui/src/app/Pages/employee/employee.component.html index 21257c90..e1bf3e4b 100644 --- a/ui/src/app/Pages/employee/employee.component.html +++ b/ui/src/app/Pages/employee/employee.component.html @@ -67,7 +67,7 @@

All Employees

Employee Info
- + Employee Name All Employees
Choose Company - - Education - Government + + + {{companyData.name}} +
diff --git a/ui/src/app/Pages/employee/employee.component.ts b/ui/src/app/Pages/employee/employee.component.ts index 9472e98f..f452cfa9 100644 --- a/ui/src/app/Pages/employee/employee.component.ts +++ b/ui/src/app/Pages/employee/employee.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { PageEvent } from '@angular/material/paginator'; -import { BehaviorSubject, switchMap } from 'rxjs'; import { MessageService } from 'src/app/core/services/config/message.service'; +import { Company } from 'src/app/domain/company/models/company'; import { EmployeeRepository } from 'src/app/domain/employee/employee.repository'; -import { emplyee } from 'src/app/domain/employee/model/emplyee'; +import { emplyee } from 'src/app/domain/employee/models/emplyee'; +import { CompanyRepository } from 'src/app/domain/company/company.repository'; @Component({ selector: 'app-employee', @@ -18,22 +18,24 @@ export class EmployeeComponent implements OnInit { size: number = 10; totalItems: number = 0; allEmployees: emplyee[] = []; - isRestButtonAppear: boolean; + company:Company[]=[]; + constructor( private formBuilder: FormBuilder, private employeeRepository: EmployeeRepository, - private message: MessageService - ) {} + private message: MessageService , + private companyRepositiory:CompanyRepository ) {} ngOnInit(): void { this.employForm(); this.getAllEmplyees(); + this.getCompany(); } employForm() { this.employeeForm = this.formBuilder.group({ id: [''], name: ['', [Validators.required]], - companyId: ['', [Validators.required]], + company: ['', [Validators.required]], }); } SaveData(){ @@ -43,8 +45,10 @@ export class EmployeeComponent implements OnInit { } } addEmployee(){ + this.employeeRepository.add(this.employeeForm.value).subscribe(()=>{ this.getAllEmplyees();this.changeVisibility(); + }) } getAllEmplyees(): void { @@ -58,6 +62,15 @@ export class EmployeeComponent implements OnInit { this.totalItems = result.pagination.itemCount; }); } + getCompany(): void { + this.companyRepositiory + .getList() + .subscribe((result) => { + this.company = result.data; + + console.log(this.company) + }); + } fetchData(employeeData:emplyee):void{ this.employeeForm.reset(); this.isVisible=true; diff --git a/ui/src/app/domain/company/models/company.ts b/ui/src/app/domain/company/models/company.ts index 96cb1a72..883c75f2 100644 --- a/ui/src/app/domain/company/models/company.ts +++ b/ui/src/app/domain/company/models/company.ts @@ -2,4 +2,6 @@ export interface Company{ id:number; name:string; description:string; + + } diff --git a/ui/src/app/domain/employee/employee.repository.ts b/ui/src/app/domain/employee/employee.repository.ts index 430700b8..06c0ae36 100644 --- a/ui/src/app/domain/employee/employee.repository.ts +++ b/ui/src/app/domain/employee/employee.repository.ts @@ -1,7 +1,7 @@ import { HttpClient } from "@angular/common/http"; import { Injectable } from "@angular/core"; import { ResourceService } from "src/app/core/services/config/resource.service"; -import { emplyee } from "./model/emplyee"; +import { emplyee } from "./models/emplyee"; @Injectable({ providedIn: 'root' }) diff --git a/ui/src/app/domain/employee/model/Emplyee.ts b/ui/src/app/domain/employee/model/Emplyee.ts deleted file mode 100644 index 537a5ed5..00000000 --- a/ui/src/app/domain/employee/model/Emplyee.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface emplyee{ - id:number; - name:string; - - } - \ No newline at end of file diff --git a/ui/src/app/domain/employee/models/emplyee.ts b/ui/src/app/domain/employee/models/emplyee.ts new file mode 100644 index 00000000..ac05b60e --- /dev/null +++ b/ui/src/app/domain/employee/models/emplyee.ts @@ -0,0 +1,9 @@ +import { Company } from "../../company/models/company"; + +export interface emplyee{ + id:number; + name:string; + company:Company; + + } + \ No newline at end of file From a62f72f9092583964b380edc1ef68cfeb3db25c1 Mon Sep 17 00:00:00 2001 From: Nada257 Date: Tue, 8 Nov 2022 09:21:23 +0200 Subject: [PATCH 6/8] adding Reset function,edit file name --- ui/src/app/Pages/employee/employee.component.html | 11 ++++++++--- ui/src/app/Pages/employee/employee.component.ts | 7 +++++++ ui/src/app/domain/employee/models/emplyee.ts | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ui/src/app/Pages/employee/employee.component.html b/ui/src/app/Pages/employee/employee.component.html index e1bf3e4b..ebe8e0ba 100644 --- a/ui/src/app/Pages/employee/employee.component.html +++ b/ui/src/app/Pages/employee/employee.component.html @@ -67,7 +67,7 @@

All Employees

Employee Info
- + Employee Name All Employees Choose Company - {{companyData.name}} + {{companyData.name}} @@ -112,8 +112,13 @@

All Employees

color="primary" fxFlex.lt-lg="80%" fxFlex="40">{{employeeForm.controls['id'].value?'update Employee':'add Employee'}} - +
+ +
diff --git a/ui/src/app/Pages/employee/employee.component.ts b/ui/src/app/Pages/employee/employee.component.ts index f452cfa9..197e76d2 100644 --- a/ui/src/app/Pages/employee/employee.component.ts +++ b/ui/src/app/Pages/employee/employee.component.ts @@ -19,6 +19,7 @@ export class EmployeeComponent implements OnInit { totalItems: number = 0; allEmployees: emplyee[] = []; company:Company[]=[]; + isRestButtonAppear: boolean; constructor( @@ -99,5 +100,11 @@ export class EmployeeComponent implements OnInit { changeVisibility() { this.isVisible = !this.isVisible; } + appearRest() { + this.isRestButtonAppear = true; + } + resetTheForm(){ + this.employeeForm.reset(); + } } diff --git a/ui/src/app/domain/employee/models/emplyee.ts b/ui/src/app/domain/employee/models/emplyee.ts index ac05b60e..0dc1a7b3 100644 --- a/ui/src/app/domain/employee/models/emplyee.ts +++ b/ui/src/app/domain/employee/models/emplyee.ts @@ -1,6 +1,6 @@ import { Company } from "../../company/models/company"; -export interface emplyee{ +export interface Emplyee{ id:number; name:string; company:Company; From b2fec6167ab39b3be3dcc405dfb83d102921e80c Mon Sep 17 00:00:00 2001 From: Nada257 Date: Tue, 8 Nov 2022 09:21:42 +0200 Subject: [PATCH 7/8] edit in message service --- ui/src/app/core/services/config/message.service.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/src/app/core/services/config/message.service.ts b/ui/src/app/core/services/config/message.service.ts index 54c10128..fc0d4c59 100644 --- a/ui/src/app/core/services/config/message.service.ts +++ b/ui/src/app/core/services/config/message.service.ts @@ -5,14 +5,11 @@ import { ConfirmBoxEvokeService } from '@costlydeveloper/ngx-awesome-popup'; import { Observable } from 'rxjs'; @Injectable({ - providedIn: 'root' + providedIn: 'root', }) export class MessageService { - delete(id: number) { - throw new Error('Method not implemented.'); - } errorMessage = (errorText: string): void => { - this.toast.error(errorText) + this.toast.error(errorText); }; warnMessage = (errorText: string): void => { @@ -24,7 +21,12 @@ export class MessageService { }; deleteConfirmation = (header: string, body: string): Observable => { - return this.confirmBoxEvokeService.warning(header, body, 'Confirm', 'Cancel'); + return this.confirmBoxEvokeService.warning( + header, + body, + 'Confirm', + 'Cancel' + ); }; constructor( From e069755cc933806c1a9b767756735135188f0f01 Mon Sep 17 00:00:00 2001 From: Nada257 Date: Tue, 8 Nov 2022 09:24:07 +0200 Subject: [PATCH 8/8] change the interface name in component file --- ui/src/app/Pages/employee/employee.component.ts | 8 ++++---- ui/src/app/domain/employee/employee.repository.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/src/app/Pages/employee/employee.component.ts b/ui/src/app/Pages/employee/employee.component.ts index 197e76d2..1d1a4c90 100644 --- a/ui/src/app/Pages/employee/employee.component.ts +++ b/ui/src/app/Pages/employee/employee.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MessageService } from 'src/app/core/services/config/message.service'; import { Company } from 'src/app/domain/company/models/company'; import { EmployeeRepository } from 'src/app/domain/employee/employee.repository'; -import { emplyee } from 'src/app/domain/employee/models/emplyee'; +import { Emplyee } from 'src/app/domain/employee/models/emplyee'; import { CompanyRepository } from 'src/app/domain/company/company.repository'; @Component({ @@ -17,7 +17,7 @@ export class EmployeeComponent implements OnInit { page: number = 0; size: number = 10; totalItems: number = 0; - allEmployees: emplyee[] = []; + allEmployees: Emplyee[] = []; company:Company[]=[]; isRestButtonAppear: boolean; @@ -72,7 +72,7 @@ export class EmployeeComponent implements OnInit { console.log(this.company) }); } - fetchData(employeeData:emplyee):void{ + fetchData(employeeData:Emplyee):void{ this.employeeForm.reset(); this.isVisible=true; @@ -89,7 +89,7 @@ export class EmployeeComponent implements OnInit { this.changeVisibility(); }) } - deleteEmployee(employeeData:emplyee){ + deleteEmployee(employeeData:Emplyee){ this.message.deleteConfirmation('','Are you sure want to delete this employee ? ').subscribe(res =>{ if(res.success) this.employeeRepository.delete(employeeData.id).subscribe(()=>{ diff --git a/ui/src/app/domain/employee/employee.repository.ts b/ui/src/app/domain/employee/employee.repository.ts index 06c0ae36..d6b71057 100644 --- a/ui/src/app/domain/employee/employee.repository.ts +++ b/ui/src/app/domain/employee/employee.repository.ts @@ -1,12 +1,12 @@ import { HttpClient } from "@angular/common/http"; import { Injectable } from "@angular/core"; import { ResourceService } from "src/app/core/services/config/resource.service"; -import { emplyee } from "./models/emplyee"; +import { Emplyee } from "./models/emplyee"; @Injectable({ providedIn: 'root' }) -export class EmployeeRepository extends ResourceService{ +export class EmployeeRepository extends ResourceService{ constructor(httpClient: HttpClient) { super(httpClient); }