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

feat(reports): Added report views to view single reports. (TV-205)

Browse Source 
Squashed commit of the following:

commit bb28714969a6ac2d2b57134179344169edc1dc1d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Oct 12 14:15:45 2021 +0200

    Updated routing for signal

commit deb5082659065089c7014c7114538851e13fd6e4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Oct 12 14:07:33 2021 +0200

    Moved around files

commit 2637261f21968e63fcab4b13cccd8d68ab2ac6fe
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Oct 12 11:22:11 2021 +0200

    Added avvikelse to single report page... also started with refactoring models a bit

commit 53c6a59551bfa0887b22d03419b3434a8c213b50
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Oct 12 09:56:22 2021 +0200

    Implemented frånvaro report

commit e8ccbf15885f0bfa6eb86a9681464a2e04457f99
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Oct 11 16:42:16 2021 +0200

    Added gemensam planering page

commit ebbf6f43ca
Merge: 45aec375 eac45ebd
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Oct 11 15:14:02 2021 +0200

    Merge branch 'next' into develop

commit 45aec3755f
Merge: e4cff086 99c0ac3a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Oct 11 13:24:11 2021 +0200

    Merge branch 'next' into develop

commit e4cff086c4
Merge: ef10270f 631418bc
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Oct 11 09:47:05 2021 +0200

    Merge branch 'next' into develop

commit ef10270fa9
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Oct 11 09:23:59 2021 +0200

    Removed test build from develop
This commit is contained in:
Erik Tiekstra
2021-10-12 14:23:27 +02:00
parent eac45ebd16
commit 0045cafd77
81 changed files with 1104 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/mina-sidor-fa/src/app/shared/services/api/avvikelse-api.service.ts
View File

@@ -1,10 +1,12 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { ErrorType } from '@msfa-enums/error-type.enum';
import { environment } from '@msfa-environment';
import { FragorForAvvikelserResponse } from '@msfa-models/api/fragor-for-avvikelser.response';
import { KandaAvvikelseKoderResponse } from '@msfa-models/api/kanda-avvikelse-koder.response.model';
import { OrsaksKoderAvvikelseResponse } from '@msfa-models/api/orsaks-koder-avvikelse.response.model';
import { Avvikelse } from '@msfa-models/avvikelse.model';
import { Avvikelse_OLD } from '@msfa-models/avvikelse.model';
import { CustomError } from '@msfa-models/error/custom-error';
import { FragorForAvvikelser, mapResponseToFragorForAvvikelser } from '@msfa-models/fragor-for-avvikelser.model';
import { mapResponseToOrsaksKoderAvvikelse, OrsaksKoderAvvikelse } from '@msfa-models/orsaks-koder-avvikelse.model';
import {
@@ -15,8 +17,6 @@ import {
} from '@msfa-models/orsaks-koder-franvaro.model';
import { Observable } from 'rxjs';
import { catchError, filter, map } from 'rxjs/operators';
import { CustomError } from '@msfa-models/error/custom-error';
import { ErrorType } from '@msfa-enums/error-type.enum';
@Injectable({
providedIn: 'root',
@@ -58,7 +58,7 @@ export class AvvikelseApiService {
);
}
public createAvvikelse$(avvikelse: Avvikelse): Observable<unknown> {
public createAvvikelse$(avvikelse: Avvikelse_OLD): Observable<unknown> {
return this.httpClient.post<void>(`${this._apiBaseUrl}/avvikelse`, avvikelse).pipe(
catchError((error: Error) => {
throw new CustomError({
@@ -70,7 +70,7 @@ export class AvvikelseApiService {
);
}
public createFranvaro$(avvikelse: Avvikelse): Promise<void> {
public createFranvaro$(avvikelse: Avvikelse_OLD): Promise<void> {
return this.httpClient.post<void>(`${this._apiBaseUrl}/franvaro`, avvikelse).toPromise();
}
}

4
apps/mina-sidor-fa/src/app/shared/services/api/franvaro-report.api.service.ts
View File

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
import { environment } from '@msfa-environment';
import { OrsaksKoderFranvaroResponse } from '@msfa-models/api/orsaks-koder-franvaro.response.model';
import { Avrop } from '@msfa-models/avrop.model';
import { FranvaroRequestData } from '@msfa-models/avvikelse.model';
import { FranvaroRequestData_OLD } from '@msfa-models/avvikelse.model';
import { CustomError, errorToCustomError } from '@msfa-models/error/custom-error';
import { mapResponseToOrsaksKoderFranvaro, OrsaksKoderFranvaro } from '@msfa-models/orsaks-koder-franvaro.model';
import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
@@ -47,7 +47,7 @@ export class FranvaroReportApiService {
return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
}
public async postFranvaroReport$(requestData: FranvaroRequestData): Promise<void> {
public async postFranvaroReport$(requestData: FranvaroRequestData_OLD): Promise<void> {
return this.httpClient.post<void>(`${this._apiBaseUrl}/franvaro`, requestData).toPromise();
}
}

22
apps/mina-sidor-fa/src/app/shared/services/api/gemensam-planering-api.service.ts
View File

@@ -4,17 +4,24 @@ import { environment } from '@msfa-environment';
import { Activity, mapResponseToActivity } from '@msfa-models/activity.model';
import { ActivityResponse } from '@msfa-models/api/activity.response.model';
import { GemensamPlaneringPostRequest } from '@msfa-models/api/gemensam-planering.request.model';
import { GemensamPlaneringResponse } from '@msfa-models/api/gemensam-planering.response.model';
import { Params } from '@msfa-models/api/params.model';
import { Avrop } from '@msfa-models/avrop.model';
import { CustomError, errorToCustomError } from '@msfa-models/error/custom-error';
import {
GemensamPlaneringDetailed,
mapResponseToGemensamPlaneringDetailed,
} from '@msfa-models/gemensam-planering.model';
import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
import { Observable } from 'rxjs';
import { catchError, filter, map, shareReplay } from 'rxjs/operators';
import { catchError, filter, map, shareReplay, switchMap } from 'rxjs/operators';
@Injectable({
providedIn: 'root',
})
export class GemensamPlaneringApiService {
private _apiBaseUrl = `${environment.api.url}/rapporter/gemensam-planering`;
private _apiHandlingarUrl = `${environment.api.url}/handlingar`;
public fetchActivities$(): Observable<Activity[]> {
return this.httpClient.get<{ data: ActivityResponse[] }>(`${this._apiBaseUrl}/aktiviteter`).pipe(
@@ -33,6 +40,19 @@ export class GemensamPlaneringApiService {
return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
}
public fetchReport$(genomforandeReferens: number, reportId: string): Observable<GemensamPlaneringDetailed> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return this.fetchActivities$().pipe(
switchMap(activities =>
this.httpClient
.get<{ data: GemensamPlaneringResponse }>(`${this._apiHandlingarUrl}/${reportId}`, { params })
.pipe(map(({ data }) => mapResponseToGemensamPlaneringDetailed(data, activities)))
)
);
}
public async postGemensamPlanering$(requestData: GemensamPlaneringPostRequest): Promise<void> {
return this.httpClient.post<void>(`${this._apiBaseUrl}`, requestData).toPromise();
}

107
apps/mina-sidor-fa/src/app/shared/services/api/report.api.service.ts Normal file
View File

@@ -0,0 +1,107 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { environment } from '@msfa-environment';
import { Activity } from '@msfa-models/activity.model';
import { AvvikelseReportResponse } from '@msfa-models/api/avvikelse-response.model';
import { FranvaroReportResponse } from '@msfa-models/api/franvaro-response.model';
import { GemensamPlaneringResponse } from '@msfa-models/api/gemensam-planering.response.model';
import { Params } from '@msfa-models/api/params.model';
import { Avrop } from '@msfa-models/avrop.model';
import { AvvikelseReport, mapResponseToAvvikelse } from '@msfa-models/avvikelse.model';
import { FragorForAvvikelser } from '@msfa-models/fragor-for-avvikelser.model';
import { FranvaroReport, mapResponseToFranvaro } from '@msfa-models/franvaro.model';
import {
GemensamPlaneringDetailed,
mapResponseToGemensamPlaneringDetailed,
} from '@msfa-models/gemensam-planering.model';
import { OrsaksKoderAvvikelse } from '@msfa-models/orsaks-koder-avvikelse.model';
import { OrsaksKoderFranvaro } from '@msfa-models/orsaks-koder-franvaro.model';
import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service';
import { combineLatest, Observable } from 'rxjs';
import { filter, map, switchMap } from 'rxjs/operators';
import { AvvikelseApiService } from './avvikelse-api.service';
import { FranvaroReportApiService } from './franvaro-report.api.service';
import { GemensamPlaneringApiService } from './gemensam-planering-api.service';
@Injectable({
providedIn: 'root',
})
export class ReportApiService {
private _apiBaseUrl = `${environment.api.url}/handlingar`;
private _avvikelseReasons$: Observable<OrsaksKoderAvvikelse[]> = this.avvikelseApiService.getOrsaksKoderAvvikelse$();
private _avvikelseQuestions$: Observable<FragorForAvvikelser[]> = this.avvikelseApiService.getFragorForAvvikelser$();
private _activities$: Observable<Activity[]> = this.gemensamPlaneringApiService.fetchActivities$();
private _franvaroReasons$: Observable<OrsaksKoderFranvaro[]> = this.franvaroReportApiService.fetchReasons$();
private _otherFranvaroReasons$: Observable<
OrsaksKoderFranvaro[]
> = this.franvaroReportApiService.fetchOtherKnownReasons$();
constructor(
private httpClient: HttpClient,
private deltagareApiService: DeltagareApiService,
private gemensamPlaneringApiService: GemensamPlaneringApiService,
private franvaroReportApiService: FranvaroReportApiService,
private avvikelseApiService: AvvikelseApiService
) {}
public fetchAvropInformation$(genomforandeReferens: number): Observable<Avrop> {
return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens);
}
public fetchGemensamPlanering$(
genomforandeReferens: number,
reportId: string
): Observable<GemensamPlaneringDetailed> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return this._activities$.pipe(
switchMap(activities =>
this.httpClient
.get<{ data: GemensamPlaneringResponse }>(`${this._apiBaseUrl}/${reportId}`, { params })
.pipe(map(({ data }) => mapResponseToGemensamPlaneringDetailed(data, activities)))
)
);
}
public fetchFranvaroReport$(genomforandeReferens: number, reportId: string): Observable<FranvaroReport> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return combineLatest([this._franvaroReasons$, this._otherFranvaroReasons$]).pipe(
filter(([reasons, otherReasons]) => !!(reasons && otherReasons)),
switchMap(([reasons, otherReasons]) => {
return this.httpClient
.get<{ data: FranvaroReportResponse }>(`${this._apiBaseUrl}/${reportId}`, { params })
.pipe(
map(({ data }) => ({
genomforandeReferens: data.genomforandeReferens,
franvaro: mapResponseToFranvaro(data.franvaro, reasons, otherReasons),
}))
);
})
);
}
public fetchAvvikelseReport$(genomforandeReferens: number, reportId: string): Observable<AvvikelseReport> {
const params: Params = {
genomforandereferens: genomforandeReferens.toString(),
};
return combineLatest([this._avvikelseReasons$, this._avvikelseQuestions$]).pipe(
filter(([reasons, questions]) => !!(reasons && questions)),
switchMap(([reasons, questions]) => {
return this.httpClient
.get<{ data: AvvikelseReportResponse }>(`${this._apiBaseUrl}/${reportId}`, { params })
.pipe(
map(({ data }) => ({
genomforandeReferens: data.genomforandeReferens,
avvikelse: mapResponseToAvvikelse(data.avvikelseAlternativ, reasons, questions),
}))
);
})
);
}
}