diff --git a/src/app/components/employee-detail/employee-detail.component.html b/src/app/components/employee-detail/employee-detail.component.html index 30fe658..0968dfb 100644 --- a/src/app/components/employee-detail/employee-detail.component.html +++ b/src/app/components/employee-detail/employee-detail.component.html @@ -1,28 +1,29 @@ -
- -
- -
-
-

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

-

Straße: {{ employee.street }}

-

Postleitzahl: {{ employee.postcode }}

-

Stadt: {{ employee.city }}

-

Telefonnummer: {{ employee.phone }}s

- - +
+
+
+ +
+
+

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

+

Straße: {{ employee.street }}

+

Postleitzahl: {{ employee.postcode }}

+

Stadt: {{ employee.city }}

+

Telefonnummer: {{ employee.phone }}s

+ + -
-
-

Qualifikationen

-
    - @for(skill of skillSet; track skill) { -
  • {{ skill }}
  • - } +
+
+

Qualifikationen

+
    + @for(skill of skillSet; track skill) { +
  • {{ skill }}
  • + } -
+ +
+
-
diff --git a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts index 8e6e536..215be8f 100644 --- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts +++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts @@ -3,7 +3,7 @@ import { EmployeeNameAndSkillDataDTO, EmployeeRequestPutDTO, EmployeeResponseDTO import { AbstractControl, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { HttpClient } from '@angular/common/http'; import { Router } from '@angular/router'; -import { AsyncPipe, NgFor } from '@angular/common'; +import { AsyncPipe, NgFor, Location } from '@angular/common'; import { SkillService } from '../../service/skill.service'; import { QualificationGetDTO } from '../../models/skill'; import { Observable, of } from 'rxjs'; @@ -24,10 +24,10 @@ export class MitarbeiterFormComponent { public hasAllSkills: boolean = false; errorMessages: Record = {}; - constructor(public http: HttpClient, public router: Router, private skillService: SkillService) {} + constructor(public http: HttpClient, public router: Router, private skillService: SkillService, private location: Location) {} returnToEmployeeOverview() { - this.router.navigate(["mitarbeiter"]); + this.location.back(); } private setupForm() {