Merge pull request #174 in TEA/mina-sidor-fa-web from feature/TV-724-refaktorera-deltagare to develop
Squashed commit of the following: commit 4c6ced007ea583a31cc3a4a6e71a431e65cece7f Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Oct 5 11:08:21 2021 +0200 fix routing and make deltagare-card part of deltagare-details commit fea3bd1acfc225687876de18a75eb7b22240f17c Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Oct 5 10:42:36 2021 +0200 refactor reports list commit 96a0758fa52ef1c42a72f65973a2ce047244de00 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Oct 5 10:37:37 2021 +0200 refactor commit ac35e321b70f0a624d99b315ea7c88ef507699cc Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Oct 5 10:35:05 2021 +0200 refaktorera deltagare commit d3b88e88f7d798cc1450b8be3ea344cb8b2863b1 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Oct 5 09:51:23 2021 +0200 refactoring deltagare
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
<digi-ng-dialog
|
||||
*ngIf="openConfirmDialog"
|
||||
[afActive]="openConfirmDialog"
|
||||
(afOnPrimaryClick)="sendRequest()"
|
||||
(afOnSecondaryClick)="closeConfirmDialog()"
|
||||
(afOnInactive)="closeConfirmDialog()"
|
||||
afHeading="Bekräfta"
|
||||
afHeadingLevel="h2"
|
||||
[afAriaLabel]="'Bekräfta att skicka in en ' + reportToConfirm"
|
||||
afPrimaryButtonText="Skicka"
|
||||
afSecondaryButtonText="Avbryt"
|
||||
>
|
||||
<p>Är du säker på att du vill skicka in en {{reportToConfirm}}?</p>
|
||||
</digi-ng-dialog>
|
||||
@@ -0,0 +1,29 @@
|
||||
import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
|
||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { ConfirmDialogComponent } from './confirm-dialog.component';
|
||||
|
||||
|
||||
describe('DeltagareCreateAvvikelseComponent', () => {
|
||||
let component: ConfirmDialogComponent;
|
||||
let fixture: ComponentFixture<ConfirmDialogComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||
declarations: [ConfirmDialogComponent],
|
||||
imports: [DigiNgDialogModule]
|
||||
})
|
||||
.compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(ConfirmDialogComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,25 @@
|
||||
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
|
||||
import { ConfirmDialog } from '@msfa-enums/confirm-dialog.enum';
|
||||
|
||||
@Component({
|
||||
selector: 'msfa-confirm-dialog',
|
||||
templateUrl: './confirm-dialog.component.html',
|
||||
styleUrls: ['./confirm-dialog.component.scss'],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush
|
||||
})
|
||||
export class ConfirmDialogComponent {
|
||||
@Input() openConfirmDialog: boolean;
|
||||
@Input() reportToConfirm: string;
|
||||
@Output() confirmDialogChanged = new EventEmitter<ConfirmDialog>();
|
||||
|
||||
sendRequest(): void {
|
||||
this.openConfirmDialog = false;
|
||||
this.confirmDialogChanged.emit(ConfirmDialog.ACCEPTED);
|
||||
}
|
||||
|
||||
closeConfirmDialog(): void {
|
||||
this.openConfirmDialog = false;
|
||||
this.confirmDialogChanged.emit(ConfirmDialog.DISMISSED);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
|
||||
import { ConfirmDialogComponent } from './confirm-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||
declarations: [ConfirmDialogComponent],
|
||||
imports: [CommonModule, DigiNgDialogModule],
|
||||
exports: [ConfirmDialogComponent],
|
||||
})
|
||||
export class ConfirmDialogModule {}
|
||||
@@ -19,21 +19,17 @@ import { filter } from 'rxjs/operators';
|
||||
})
|
||||
export class LayoutComponent extends UnsubscribeDirective {
|
||||
@Input() showBreadCrumbs = true;
|
||||
private readonly _startBreadcrumb: NavigationBreadcrumbsItem = {
|
||||
text: 'Start',
|
||||
routerLink: '/',
|
||||
};
|
||||
private _breadcrumbsItems$ = new BehaviorSubject<NavigationBreadcrumbsItem[]>([this._startBreadcrumb]);
|
||||
isLoggedIn$: Observable<boolean> = this.authenticationService.isLoggedIn$;
|
||||
selectedOrganization$: Observable<Organization> = this.userService.selectedOrganization$;
|
||||
user$: Observable<Employee> = this.userService.user$.pipe(filter(user => !!user));
|
||||
roles$: Observable<Role[]> = this.userService.userRoles$.pipe(filter(roles => !!roles));
|
||||
userLoading$: Observable<boolean> = this.userService.userLoading$;
|
||||
rolesLoading$: Observable<boolean> = this.userService.userRolesLoading$;
|
||||
|
||||
get breadcrumbsItems(): NavigationBreadcrumbsItem[] {
|
||||
return this._breadcrumbsItems$.getValue();
|
||||
}
|
||||
private readonly _startBreadcrumb: NavigationBreadcrumbsItem = {
|
||||
text: 'Start',
|
||||
routerLink: '/',
|
||||
};
|
||||
private _breadcrumbsItems$ = new BehaviorSubject<NavigationBreadcrumbsItem[]>([this._startBreadcrumb]);
|
||||
|
||||
constructor(
|
||||
private router: Router,
|
||||
@@ -65,4 +61,11 @@ export class LayoutComponent extends UnsubscribeDirective {
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
get breadcrumbsItems(): NavigationBreadcrumbsItem[] {
|
||||
return this._breadcrumbsItems$.getValue().map(breadcrumb => ({
|
||||
...breadcrumb,
|
||||
text: breadcrumb.text.replaceAll('-', ' '),
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user