feat(informativ-rapport): Implemented Informativ rapport. (TV-782)
Squashed commit of the following: commit 5206466fd53275ed16d5a529abafc41db3fc09a5 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 15:11:45 2021 +0200 Merge pull request #218 in TEA/mina-sidor-fa-web from feature/TV-813 to feature/TV-782-informativ-rapport Squashed commit of the following: commit ba53ee6e2a4e7835a84b67f9ea80336a6ddc6b4f Merge: 36f8676ccfde226fAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:23:58 2021 +0200 Merge branch 'develop' into feature/TV-813 commit 36f8676cd80899937a27fd4c7873ec2adf908d67 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:19:01 2021 +0200 Removed unused module inside reportviews commit 31f6a26747bbd75d16c887674464f40d015da7a2 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:14:46 2021 +0200 Added component for report-description-list commit 2d7406fd64abcb1936f3a2145bbfb98da7f0ac7c Merge: 2e35a67dcfde226fAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:23:43 2021 +0200 Merge branch 'develop' into feature/TV-782-informativ-rapport commit 2e35a67db54609a00e167198648e46c25a94eea8 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 12:16:22 2021 +0200 Changed type to category commit 000c2b966a697b724a1bc58ea5ba9503b8782f42 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 12:05:57 2021 +0200 Updated with information texts commit 275f18a094ed03319ac4a6668b08a697f0202fee Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 10:24:42 2021 +0200 Implemented informativ rapport commit 4544e7c180994a009f0a93b2645965ae725ec901 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 08:10:03 2021 +0200 Added base for informativ rapport commit 36329210f4dffa2a3d8bed2a571fa880fe3b75fc Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Oct 21 14:55:09 2021 +0200 WIP
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<a
|
||||
class="navigation__logo-link"
|
||||
[routerLink]="['/']"
|
||||
aria-label="Till startsidan för mina sidor för fristående aktörer"
|
||||
aria-label="Till startsidan för Mina sidor för fristående aktörer"
|
||||
>
|
||||
<digi-logo af-system-name="Mina sidor för fristående aktörer" af-color="secondary"></digi-logo>
|
||||
</a>
|
||||
|
||||
@@ -4,6 +4,7 @@ export const DELTAGARE_REPORTING_ROUTES = {
|
||||
franvarorapport: 'Avvikelserapport (frånvaro)',
|
||||
avvikelserapport: 'Avvikelserapport (avvikelse)',
|
||||
signal: 'Signal om arbete eller studier',
|
||||
'informativ-rapport': 'Informativ rapport',
|
||||
};
|
||||
|
||||
export const NAVIGATION = {
|
||||
|
||||
@@ -14,4 +14,5 @@ export enum Feature {
|
||||
REPORTING,
|
||||
REPORTING_SIGNAL,
|
||||
REPORTING_PERIODISK_REDOVISNING,
|
||||
REPORTING_INFORMATIV_RAPPORT,
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
export enum InformativRapportCategory {
|
||||
annan_insats = 'Behov av annan insats',
|
||||
hjalpmedel = 'Behov av hjälpmedel',
|
||||
teckensprakstolk = 'Behov av teckenspråkstolk',
|
||||
dialog = 'Behov av dialog med Arbetsförmedlingen',
|
||||
}
|
||||
|
||||
export type InformativRapportCategoryKey = keyof InformativRapportCategory;
|
||||
@@ -0,0 +1,6 @@
|
||||
import { InformativRapportCategoryKey } from '@msfa-enums/informativ-rapport-category.enum';
|
||||
export interface InformativRapportRequest {
|
||||
genomforandeReferens: number;
|
||||
category: InformativRapportCategoryKey;
|
||||
comment: string;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
import { InformativRapportCategoryKey } from '@msfa-enums/informativ-rapport-category.enum';
|
||||
|
||||
export interface InformativRapportResponse {
|
||||
category: InformativRapportCategoryKey;
|
||||
comment: string;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
import { InformativRapportCategory } from '@msfa-enums/informativ-rapport-category.enum';
|
||||
import { InformativRapportResponse } from './api/informativ-rapport.response.model';
|
||||
|
||||
export interface InformativRapport {
|
||||
category: InformativRapportCategory;
|
||||
comment: string;
|
||||
}
|
||||
|
||||
export function mapResponseToInformativRapport(data: InformativRapportResponse): InformativRapport {
|
||||
const { category, comment } = data;
|
||||
|
||||
return {
|
||||
category: InformativRapportCategory[category] as InformativRapportCategory,
|
||||
comment: comment,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
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 { InformativRapportRequest } from '@msfa-models/api/informativ-rapport.request.model';
|
||||
import { CustomError } from '@msfa-models/error/custom-error';
|
||||
import { Observable } from 'rxjs';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class InformativRapportApiService {
|
||||
private _apiBaseUrl = `${environment.api.url}/rapporter/informativ-rapport`;
|
||||
|
||||
public postInformativRapport$(requestData: InformativRapportRequest): Observable<void> {
|
||||
return this.httpClient.post<void>(this._apiBaseUrl, requestData).pipe(
|
||||
catchError((error: Error) => {
|
||||
throw new CustomError({
|
||||
error,
|
||||
message: `Kunde inte spara Informativ rapport.\n\n${error.message}`,
|
||||
type: ErrorType.API,
|
||||
});
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
constructor(private httpClient: HttpClient) {}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ export function RequiredValidator(message = 'Fältet är obligatoriskt'): Valida
|
||||
if (
|
||||
control.value === null ||
|
||||
control.value === undefined ||
|
||||
control.value === '' ||
|
||||
(Array.isArray(control.value) && !control.value.length)
|
||||
) {
|
||||
return { required: message };
|
||||
|
||||
Reference in New Issue
Block a user