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

Merge pull request #184 in TEA/mina-sidor-fa-web from feature/TV-731-refaktorisera-avvikelserapport to develop

Browse Source 
Squashed commit of the following:

commit 62ea9988b66107457da553bf2cd0e423a6f44606
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Oct 7 08:26:52 2021 +0200

    simplify post requests

commit bf35fa3f4972536c52c15d0ef942678e565fff74
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Oct 7 07:44:15 2021 +0200

    Update deltagare-avvikelse.component.html

commit 22e55d0e51eb83f2d8bbc6c9e3a65d2bd479fa92
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 17:06:27 2021 +0200

    wip

commit 2836a0c7687755dbf7b7e20d98f24d9bf3bc3f40
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 16:55:14 2021 +0200

    merge with develop

commit 77f16e8a1961b623bb741056882a1df3480f9d13
Merge: a4e3b940 890573b1
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 16:51:50 2021 +0200

    Merge branch 'develop' into feature/TV-731-refaktorisera-avvikelserapport

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelse/deltagare-avvikelse.component.html
    #	apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelse/deltagare-avvikelse.component.ts

commit a4e3b940ca9e2e484f92dd5d05e14a65e714b897
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 16:38:35 2021 +0200

    Refactor avvikelse

commit 5e1923324801baba29bcf2273908075ccc5e29e1
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 15:13:34 2021 +0200

    Update deltagare-avvikelse.component.html

commit e57b42761b07899f3922f65995bc905abed44c83
Merge: 14a776bc 19a3b05e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Oct 6 12:54:23 2021 +0200

    Merged develop

commit 14a776bc2e72dd7145dfe27e5e5745cc0d5b43a1
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 12:33:57 2021 +0200

    correct API

commit 9c155b578454865aaa6a4557348d3fd460459434
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 11:36:38 2021 +0200

    match utv API

commit 6625524adab2e04269ad14a3c581505e83c8483a
Merge: 2a9cbee7 3d941fdd
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 10:45:46 2021 +0200

    Merge branch 'develop' into feature/TV-731-refaktorisera-avvikelserapport

commit 2a9cbee7e544decb0a897063bcbbe6b0ac883608
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 5 15:06:42 2021 +0200

    Update deltagare-avvikelse.component.ts
This commit is contained in:
Daniel Appelgren
2021-10-07 09:28:58 +02:00
parent 890573b1fe
commit 28f94c7a29
9 changed files with 267 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/mina-sidor-fa/src/app/shared/models/avvikelse.model.ts
View File

@@ -2,30 +2,27 @@ import { AvvikelseAlternativ } from './avvikelse-alternativ.model';
import { FranvaroAlternativ } from './franvaro-alternativ.model';
export interface Avvikelse {
datum_for_rapportering: string,
sokandeId: number;
avvikelsealternativ?: AvvikelseAlternativ,
franvaro?: FranvaroAlternativ
genomforandeReferens: number;
avvikelseAlternativ?: AvvikelseAlternativ;
franvaro?: FranvaroAlternativ;
}
export interface AvvikelseRequestData {
datum_for_rapportering: string,
sokandeId: number;
avvikelsealternativ: AvvikelseAlternativ,
genomforandeReferens: number;
avvikelseAlternativ: AvvikelseAlternativ;
}
export interface FranvaroRequestData {
datum_for_rapportering: string,
sokandeId: number;
franvaro: FranvaroAlternativ
genomforandeReferens: number;
franvaro: FranvaroAlternativ;
}
export function mapAvvikelseRequestDataToAvvikelse(data: AvvikelseRequestData): Avvikelse {
const { datum_for_rapportering, sokandeId, avvikelsealternativ } = data;
return {
datum_for_rapportering,
sokandeId,
avvikelsealternativ
}
return data;
// const { genomforandeReferens, avvikelseAlternativ } = data;
//
// return {
// genomforandeReferens,
// avvikelseAlternativ,
// };
}

20
apps/mina-sidor-fa/src/app/shared/models/franvaro-alternativ.model.ts
View File

@@ -1,15 +1,15 @@
export interface FranvaroAlternativ {
avvikelseorsakskod: string;
avvikelseOrsaksKod: string;
datum: string;
heldag: boolean;
starttid: string;
sluttid: string;
forvantad_narvaro: {
starttid: string;
sluttid: string;
},
alternativ_for_kanda_orsaker: {
typ: string,
startTid: string;
slutTid: string;
forvantadNarvaro: {
startTid: string;
slutTid: string;
};
alternativForKandaOrsaker: {
typ: string;
motivering: string;
}
};
}

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

@@ -1,12 +1,10 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { ReportType } from '@msfa-enums/report-type.enum';
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, AvvikelseRequestData, mapAvvikelseRequestDataToAvvikelse } from '@msfa-models/avvikelse.model';
import { Avvikelse } from '@msfa-models/avvikelse.model';
import { FragorForAvvikelser, mapResponseToFragorForAvvikelser } from '@msfa-models/fragor-for-avvikelser.model';
import { mapResponseToOrsaksKoderAvvikelse, OrsaksKoderAvvikelse } from '@msfa-models/orsaks-koder-avvikelse.model';
import {
@@ -15,15 +13,16 @@ import {
mapResponseToOrsaksKoderFranvaro,
OrsaksKoderFranvaro,
} from '@msfa-models/orsaks-koder-franvaro.model';
import { ErrorService } from '@msfa-services/error.service';
import { Observable, throwError } from 'rxjs';
import { catchError, filter, map, take } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { filter, map } from 'rxjs/operators';
@Injectable({
providedIn: 'root',
})
export class AvvikelseApiService {
private _apiBaseUrl = `${environment.api.url}/report`;
private _apiBaseUrl = `${environment.api.url}/rapporter`;
constructor(private httpClient: HttpClient) {}
public getOrsaksKoderFranvaro$(): Observable<OrsaksKoderFranvaro[]> {
return this.httpClient
@@ -57,32 +56,11 @@ export class AvvikelseApiService {
);
}
public createAvvikelse$(avvikelse: Avvikelse, alternative: string): Observable<Avvikelse> {
return this.httpClient
.post<{ data: AvvikelseRequestData }>(`${this._apiBaseUrl}/${this.setEndPoint(alternative)}`, avvikelse)
.pipe(
filter(response => !!response?.data),
take(1),
map(({ data }) => mapAvvikelseRequestDataToAvvikelse(data)),
catchError(error => throwError({ message: error as string, type: ErrorType.API }))
);
public createAvvikelse$(avvikelse: Avvikelse): Promise<void> {
return this.httpClient.post<void>(`${this._apiBaseUrl}/avvikelse`, avvikelse).toPromise();
}
private setEndPoint(alternative: string): string {
let endpoint = '';
switch (alternative) {
case ReportType.AVVIKELSE:
endpoint = 'avvikelse';
break;
case ReportType.FRANVARO:
endpoint = 'franvaro';
break;
default:
break;
}
return endpoint;
public createFranvaro$(avvikelse: Avvikelse): Promise<void> {
return this.httpClient.post<void>(`${this._apiBaseUrl}/franvaro`, avvikelse).toPromise();
}
constructor(private httpClient: HttpClient, private errorService: ErrorService) {}
}