Added my-account information and possibility to switch organizations
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
<div class="employee-card__contents">
|
||||
<div class="employee-card__block">
|
||||
<h2>Personuppgifter</h2>
|
||||
<dl class="employee-card__description-list">
|
||||
<dl>
|
||||
<dt>Förnamn</dt>
|
||||
<dd *ngIf="employee.firstName; else emptyDD">{{ employee.firstName }}</dd>
|
||||
<dt>Efternamn</dt>
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
}
|
||||
|
||||
&__block {
|
||||
width: 100%;
|
||||
max-width: var(--digi--typography--text--max-width);
|
||||
}
|
||||
|
||||
@@ -48,19 +47,6 @@
|
||||
margin-top: $digi--layout--gutter--l;
|
||||
}
|
||||
|
||||
&__description-list {
|
||||
dd {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-weight: var(--digi--typography--font-weight--semibold);
|
||||
}
|
||||
|
||||
dd {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
}
|
||||
&__list {
|
||||
@include msfa__reset-list;
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ import { ActivatedRoute } from '@angular/router';
|
||||
import { Employee } from '@msfa-models/employee.model';
|
||||
import { Role } from '@msfa-models/role.model';
|
||||
import { EmployeeService } from '@msfa-services/api/employee.service';
|
||||
import { RoleService } from '@msfa-services/role.service';
|
||||
import { BehaviorSubject, Observable } from 'rxjs';
|
||||
|
||||
@Component({
|
||||
@@ -16,10 +17,14 @@ export class EmployeeCardComponent implements OnDestroy {
|
||||
private _pendingSelectedParticipants$ = new BehaviorSubject<string[]>([]);
|
||||
employee$: Observable<Employee> = this.employeeService.employee$;
|
||||
lastUpdatedEmployeeId$: Observable<string> = this.employeeService.lastUpdatedEmployeeId$;
|
||||
allRoles: Role[] = this.employeeService.allRoles;
|
||||
allRoles: Role[] = this.roleService.allRoles;
|
||||
accordionsExpanded = [];
|
||||
|
||||
constructor(private activatedRoute: ActivatedRoute, private employeeService: EmployeeService) {
|
||||
constructor(
|
||||
private activatedRoute: ActivatedRoute,
|
||||
private employeeService: EmployeeService,
|
||||
private roleService: RoleService
|
||||
) {
|
||||
this.employeeService.setCurrentEmployeeId(this.employeeId);
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
}
|
||||
|
||||
&__block {
|
||||
width: 100%;
|
||||
max-width: var(--digi--typography--text--max-width);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import { Tjanst } from '@msfa-models/tjanst.model';
|
||||
import { UtforandeVerksamhet } from '@msfa-models/utforande-verksamhet.model';
|
||||
import { EmployeeService } from '@msfa-services/api/employee.service';
|
||||
import { TjanstService } from '@msfa-services/api/tjanst.service';
|
||||
import { RoleService } from '@msfa-services/role.service';
|
||||
import { UtforandeVerksamheterService } from '@msfa-services/utforande-verksamheter/utforande-verksamheter.service';
|
||||
import { BehaviorSubject, Observable } from 'rxjs';
|
||||
import { filter, switchMap } from 'rxjs/operators';
|
||||
@@ -30,10 +31,11 @@ export class EmployeeFormComponent implements OnInit {
|
||||
switchMap(selectedTjanstIds => this.utforandeVerksamheterService.fetchUtforandeVerksamheter$(selectedTjanstIds))
|
||||
);
|
||||
|
||||
availableRoles: Role[] = this.employeeService.allRoles;
|
||||
availableRoles: Role[] = this.roleService.allRoles;
|
||||
|
||||
constructor(
|
||||
private employeeService: EmployeeService,
|
||||
private roleService: RoleService,
|
||||
private tjanstService: TjanstService,
|
||||
private utforandeVerksamheterService: UtforandeVerksamheterService,
|
||||
private activatedRoute: ActivatedRoute,
|
||||
|
||||
Reference in New Issue
Block a user