From f941fff8d6a73dcfd53f8e60fc028189c829db12 Mon Sep 17 00:00:00 2001 From: Dorian Nemec Date: Wed, 22 Jan 2025 12:09:58 +0100 Subject: [PATCH 1/6] Changed employee detail page to english --- .../employee-detail.component.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/components/employee-detail/employee-detail.component.html b/src/app/components/employee-detail/employee-detail.component.html index 0968dfb..7c0e320 100644 --- a/src/app/components/employee-detail/employee-detail.component.html +++ b/src/app/components/employee-detail/employee-detail.component.html @@ -1,16 +1,16 @@
- +

{{ employee.firstName }} {{ employee.lastName }}

-

Straße: {{ employee.street }}

-

Postleitzahl: {{ employee.postcode }}

-

Stadt: {{ employee.city }}

-

Telefonnummer: {{ employee.phone }}s

- - +

Street: {{ employee.street }}

+

Postal Code: {{ employee.postcode }}

+

City: {{ employee.city }}

+

Phone number: {{ employee.phone }}s

+ +
@@ -19,7 +19,6 @@ @for(skill of skillSet; track skill) {
  • {{ skill }}
    • } -
    From 951ab7612893b69ee653cf0c411e4fbb6ef9b277 Mon Sep 17 00:00:00 2001 From: Dorian Nemec Date: Wed, 22 Jan 2025 12:10:40 +0100 Subject: [PATCH 2/6] Changed employee detail page to english --- .../components/employee-detail/employee-detail.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/components/employee-detail/employee-detail.component.html b/src/app/components/employee-detail/employee-detail.component.html index 7c0e320..db72d82 100644 --- a/src/app/components/employee-detail/employee-detail.component.html +++ b/src/app/components/employee-detail/employee-detail.component.html @@ -19,6 +19,7 @@ @for(skill of skillSet; track skill) {
  • {{ skill }}
    • } +
    From 60c5d41161f4991c1a7d5a58fe06d17c1acb6994 Mon Sep 17 00:00:00 2001 From: Jan Klattenhoff Date: Wed, 22 Jan 2025 12:11:04 +0100 Subject: [PATCH 3/6] fix(mitarbeiter-form): prevent adding skill with invalid id --- .../components/mitarbeiter-form/mitarbeiter-form.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts index 215be8f..d2e7a90 100644 --- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts +++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts @@ -82,6 +82,9 @@ export class MitarbeiterFormComponent { addSkill() { const id = Number(this.mitarbeiterForm.get("newSkill")?.value); + if (!id) { + return; + } this.allSkills.subscribe(skills => { const newSkill = skills.filter(skill => skill.id == id)[0]; this.mitarbeiter.skillSet?.push(newSkill); From 2e9b48be7ca7277319721a87b95de766ca8b2dd2 Mon Sep 17 00:00:00 2001 From: Jan Klattenhoff Date: Wed, 22 Jan 2025 12:12:11 +0100 Subject: [PATCH 4/6] fix(qualifikation-form): prevent adding invalid employee ID --- .../qualifikation-form/qualifikation-form.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/components/qualifikation-form/qualifikation-form.component.ts b/src/app/components/qualifikation-form/qualifikation-form.component.ts index aad7492..03c1353 100644 --- a/src/app/components/qualifikation-form/qualifikation-form.component.ts +++ b/src/app/components/qualifikation-form/qualifikation-form.component.ts @@ -55,6 +55,9 @@ export class QualifikationFormComponent { addEmployee() { const employeeId = Number(this.skillForm.get("newEmployee")?.value); + if (!employeeId) { + return; + } const employee = this.addableEmployees.find(emp => emp.id === employeeId); if (employee) { From f51619e1723c9d6ea3e05e772932b0699bb7cf50 Mon Sep 17 00:00:00 2001 From: Jan Klattenhoff Date: Wed, 22 Jan 2025 12:31:09 +0100 Subject: [PATCH 5/6] refactor: remove required validator from newSkill field --- .../mitarbeiter-form/mitarbeiter-form.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts index d2e7a90..7706745 100644 --- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts +++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts @@ -38,7 +38,7 @@ export class MitarbeiterFormComponent { postcode: new FormControl(this.mitarbeiter.postcode, [Validators.required, Validators.minLength(5), Validators.maxLength(5)]), city: new FormControl(this.mitarbeiter.city, Validators.required), phone: new FormControl(this.mitarbeiter.phone, [Validators.required, Validators.pattern('^[- +()0-9]+$')]), - newSkill: new FormControl(null, Validators.required) // Added + newSkill: new FormControl(null) }); } @@ -118,9 +118,12 @@ export class MitarbeiterFormComponent { submit() { this.updateErrorMessages(); if (!this.mitarbeiterForm.valid) { + console.log("form invalid") return; } + console.log("submit pressed") + this.mitarbeiter.firstName = this.mitarbeiterForm.get("firstName")?.value; this.mitarbeiter.lastName = this.mitarbeiterForm.get("lastName")?.value; this.mitarbeiter.street = this.mitarbeiterForm.get("street")?.value; From 2582c5b568e987fef1a67aa1db6a08c3168b18bb Mon Sep 17 00:00:00 2001 From: Jan Klattenhoff Date: Wed, 22 Jan 2025 12:35:10 +0100 Subject: [PATCH 6/6] refactor(mitarbeiter-form): remove console log statements --- .../components/mitarbeiter-form/mitarbeiter-form.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts index 7706745..f6c69e8 100644 --- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts +++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts @@ -118,12 +118,9 @@ export class MitarbeiterFormComponent { submit() { this.updateErrorMessages(); if (!this.mitarbeiterForm.valid) { - console.log("form invalid") return; } - console.log("submit pressed") - this.mitarbeiter.firstName = this.mitarbeiterForm.get("firstName")?.value; this.mitarbeiter.lastName = this.mitarbeiterForm.get("lastName")?.value; this.mitarbeiter.street = this.mitarbeiterForm.get("street")?.value;