arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
Erik Tiekstra
2021-09-27 15:37:42 +02:00
parent c3b5c46e38 60f5cb047b
commit ca32a1ed08
10 changed files with 138 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts
View File

@@ -19,11 +19,12 @@ export class DeltagareTabReportsComponent {
private _type$ = new BehaviorSubject<FormSelectItem>(null);
readonly reportsFormControlName = 'reports';
public currentGenomforandeReferens$: Observable<string> = this.activatedRoute.params.pipe(
public currentGenomforandeReferens$: Observable<number> = this.activatedRoute.params.pipe(
map(params => params.genomforandeReferens as string),
distinctUntilChanged(
([prevGenomforandeReferens], [currGenomforandeReferens]) => prevGenomforandeReferens === currGenomforandeReferens
)
),
map(genomforandeReferens => +genomforandeReferens)
);
reportsData$: Observable<ReportsData> = combineLatest([
@@ -59,7 +60,7 @@ export class DeltagareTabReportsComponent {
return this.reportPickerFormGroup?.get(this.reportsFormControlName);
}
onFormSubmitted(event: Event, reportType: string, genomforandeReferens: string): void {
onFormSubmitted(event: Event, reportType: string, genomforandeReferens: number): void {
event.preventDefault();
switch (reportType) {

5
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.ts
View File

@@ -28,11 +28,12 @@ export class DeltagareCardComponent {
private _userRoles: Role[] = this.userService.userRolesSnapshot;
public activeTab$: Observable<string> = this._activeTab$.asObservable();
public currentGenomforandeReferens$: Observable<string> = this.activatedRoute.params.pipe(
public currentGenomforandeReferens$: Observable<number> = this.activatedRoute.params.pipe(
map(params => params.genomforandeReferens as string),
distinctUntilChanged(
([prevGenomforandeReferens], [currGenomforandeReferens]) => prevGenomforandeReferens === currGenomforandeReferens
)
),
map(genomforandeReferens => +genomforandeReferens)
);
contactInformation$: Observable<ContactInformation> = this.currentGenomforandeReferens$.pipe(
switchMap(genomforandeReferens => this.deltagareCardService.fetchContactInformation$(genomforandeReferens)),