diff --git a/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html b/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html index 321f518..5efa901 100644 --- a/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html +++ b/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html @@ -10,48 +10,53 @@ (change)="emitToggle($event.target.checked)" > -
-
Namn:
-
{{avrop.fullName}}
-
-
-
Tjänst:
-
{{avrop.tjanst}}
-
-
-
Startdatum:
-
- -
-
-
-
Slutdatum:
-
- -
-
-
-
Språkstöd/Tolk:
-
{{avrop.sprakstod || '- '}}/{{avrop.tolkbehov || ' -'}}
-
-
-
Utförande adress:
-
{{avrop.utforandeAdress + ', ' + avrop.kommun}}
-
-
-
Spår/nivå:
-
{{avrop.trackName}}
-
-
-
Genomförandereferens:
-
{{avrop.genomforandeReferens}}
-
-
-
Vald handledare:
-
{{handledare?.fullName}}
+
+
+
Namn:
+
{{avrop.fullName}}
+
+
+
Tjänst:
+
{{avrop.tjanst}}
+
+
+
Startdatum:
+
+ +
+
+
+
Slutdatum:
+
+ +
+
+
+
Språkstöd/Tolk:
+
{{avrop.sprakstod || '- '}}/{{avrop.tolkbehov || ' -'}}
+
+
+
Utförande adress:
+
{{avrop.utforandeAdress + ', ' + avrop.kommun}}
+
+
+
Spår/nivå:
+
{{avrop.trackName}}
+
+
+
Genomförandereferens:
+
{{avrop.genomforandeReferens}}
+
+
+
Vald handledare:
+
{{handledare?.fullName}}
+
= this.deltagareCardService.avropInformation$; + avropInformation$: Observable = this.deltagareCardService.avropInformation$; contactInformation$: Observable = this.deltagareCardService.contactInformation$; availableHandledare$: Observable = this.avropInformation$.pipe( distinctUntilChanged((prevAvrop, currAvrop) => prevAvrop.id === currAvrop.id), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-sensitive-information/deltagare-tab-sensitive-information.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-sensitive-information/deltagare-tab-sensitive-information.component.ts index 6dc61c2..4c2e4cf 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-sensitive-information/deltagare-tab-sensitive-information.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-sensitive-information/deltagare-tab-sensitive-information.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { Disability } from '@msfa-models/disability.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { combineLatest, Observable } from 'rxjs'; @@ -17,7 +17,7 @@ export class DeltagareTabSensitiveInformationComponent { genomforandereferens$: Observable = this.activatedRoute.params.pipe( map(({ genomforandeReferens }) => +genomforandeReferens) ); - avropInformation$: Observable = this.deltagareCardService.avropInformation$; + avropInformation$: Observable = this.deltagareCardService.avropInformation$; workLanguages$: Observable = this.genomforandereferens$.pipe( switchMap(genomforandeReferens => genomforandeReferens ? this.deltagareApiService.fetchWorkLanguages$(genomforandeReferens) : null diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.service.ts index 6af6747..9bd60e8 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { ContactInformation } from '@msfa-models/contact-information.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { HandledareService } from '@msfa-services/handledare.service'; @@ -30,7 +30,7 @@ export class DeltagareCardService { shareReplay(1) ); - avropInformation$: Observable = combineLatest([ + avropInformation$: Observable = combineLatest([ this.currentGenomforandeReferens$, this.avropNeedsUpdate$, ]).pipe( diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts index e4fe4eb..252f7b4 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts @@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/ import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { AvvikelseReportRequest, AvvikelseRequest } from '@msfa-models/api/avvikelse-request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { AvvikelseQuestion } from '@msfa-models/avvikelse-question.model'; import { AvvikelseReason } from '@msfa-models/avvikelse-reason.model'; import { CustomError } from '@msfa-models/error/custom-error'; @@ -46,7 +46,7 @@ export class AvvikelseReportFormComponent implements OnInit, OnDestroy { genomforandeReferens$: Observable = this.activatedRoute.params.pipe( map((params: Params) => +params.genomforandeReferens) ); - avrop$: Observable = this.genomforandeReferens$.pipe( + avrop$: Observable = this.genomforandeReferens$.pipe( switchMap(genomforandeReferens => this.avvikelseReportFormService.fetchAvropInformation$(genomforandeReferens)), shareReplay(1) ); @@ -143,11 +143,11 @@ export class AvvikelseReportFormComponent implements OnInit, OnDestroy { return lastPossibleReportDay > new Date(); } - isAllowedToReport(avrop: Avrop): boolean { + isAllowedToReport(avrop: DeltagareAvrop): boolean { return this._isAfterStartDate(avrop.startDate) && this._isBeforeLastPossibleReportDay(avrop.endDate); } - notAllowedToReportWarning(avrop: Avrop): string { + notAllowedToReportWarning(avrop: DeltagareAvrop): string { if (!this._isBeforeLastPossibleReportDay(avrop.endDate)) { return 'Det går inte att göra Avvikelserapport (avvikelse) eftersom tjänsten har avslutats.'; } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.service.ts index 881ff4e..630a9c2 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { AvvikelseReportRequest } from '@msfa-models/api/avvikelse-request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { AvvikelseQuestion } from '@msfa-models/avvikelse-question.model'; import { AvvikelseReason, sortAvvikelseReasons } from '@msfa-models/avvikelse-reason.model'; import { AvvikelseApiService } from '@msfa-services/api/avvikelse-api.service'; @@ -14,10 +14,9 @@ export class AvvikelseReportFormService { .fetchAvvikelseQuestions$() .pipe(shareReplay(1)); - fetchAvvikelseReasons$: Observable = this.avvikelseApiService.fetchAvvikelseReasons$() - .pipe( - map(reasons => sortAvvikelseReasons(reasons)) - ); + fetchAvvikelseReasons$: Observable = this.avvikelseApiService + .fetchAvvikelseReasons$() + .pipe(map(reasons => sortAvvikelseReasons(reasons))); constructor(private avvikelseApiService: AvvikelseApiService, private deltagareApiService: DeltagareApiService) {} @@ -25,7 +24,7 @@ export class AvvikelseReportFormService { return this.avvikelseApiService.createAvvikelse$(avvikelse); } - fetchAvropInformation$(genomforandeReferens: number): Observable { + fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.ts index 74bd16a..17a06a7 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.ts @@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router'; import { ANNAN_ORSAK_ID } from '@msfa-constants/franvaro-reasons'; import { OrsaksKoderKanda } from '@msfa-enums/orsaks-koder-kanda.enum'; import { FranvaroReportRequest } from '@msfa-models/api/franvaro-request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { CustomError } from '@msfa-models/error/custom-error'; import { FranvaroReason, setKnownReason, sortFranvaroReasons } from '@msfa-models/franvaro-reason.model'; import { Franvaro } from '@msfa-models/franvaro.model'; @@ -45,15 +45,15 @@ export class FranvaroReportFormComponent { currentGenomforandeReferens$: Observable = this.activatedRoute.params.pipe( map(params => +params.genomforandeReferens) ); - avrop$: Observable = this.currentGenomforandeReferens$.pipe( + avrop$: Observable = this.currentGenomforandeReferens$.pipe( switchMap(genomforandeReferens => this.franvaroReportFormService.fetchAvropInformation$(genomforandeReferens)), shareReplay(1) ); reasons$: Observable = this.franvaroReportFormService.reasons$; - allReasons$: Observable = combineLatest([this.reasons$, this.franvaroReportFormService.otherKnownReasons$]) - .pipe( - map(([reasons, otherKnownReasons]) => sortFranvaroReasons(reasons.concat(otherKnownReasons))) - ) + allReasons$: Observable = combineLatest([ + this.reasons$, + this.franvaroReportFormService.otherKnownReasons$, + ]).pipe(map(([reasons, otherKnownReasons]) => sortFranvaroReasons(reasons.concat(otherKnownReasons)))); otherKnownReasons$: Observable = this.franvaroReportFormService.otherKnownReasons$; wholeDayOrPartOfDayRadiobuttons: Radiobutton[] = [ @@ -123,11 +123,11 @@ export class FranvaroReportFormComponent { return lastPossibleReportDay > new Date(); } - isAllowedToReport(avrop: Avrop): boolean { + isAllowedToReport(avrop: DeltagareAvrop): boolean { return this._isAfterStartDate(avrop.startDate) && this._isBeforeLastPossibleReportDay(avrop.endDate); } - notAllowedToReportWarning(avrop: Avrop): string { + notAllowedToReportWarning(avrop: DeltagareAvrop): string { if (!this._isBeforeLastPossibleReportDay(avrop.endDate)) { return 'Det går inte att göra Avvikelserapport (frånvaro) eftersom tjänsten har avslutats.'; } @@ -197,9 +197,9 @@ export class FranvaroReportFormComponent { slutTid: this.showTimePickers ? endTime : '23:59', // BÄR doesn't accept empty string or null alternativForKandaOrsaker: this.isOtherKnownReason ? { - typ: reason, - motivering: this.showKnownReasonTextArea ? knownReasonComment : '', - } + typ: reason, + motivering: this.showKnownReasonTextArea ? knownReasonComment : '', + } : null, forvantadNarvaro: { startTid: expectedPresenceStartTime, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.service.ts index 6f7e5b6..2e77186 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { FranvaroReportRequest } from '@msfa-models/api/franvaro-request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { FranvaroReason } from '@msfa-models/franvaro-reason.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { FranvaroReportApiService } from '@msfa-services/api/franvaro-report.api.service'; @@ -16,7 +16,7 @@ export class FranvaroReportFormService { private deltagareApiService: DeltagareApiService ) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts index 651fac6..022beeb 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts @@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { FormArray, FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { Activity } from '@msfa-models/activity.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { CustomError } from '@msfa-models/error/custom-error'; import { GemensamPlanering, @@ -36,7 +36,7 @@ export class GemensamPlaneringFormComponent { currentGenomforandeReferens$: Observable = this.activatedRoute.params.pipe( map(params => +params.genomforandeReferens) ); - avrop$: Observable = this.currentGenomforandeReferens$.pipe( + avrop$: Observable = this.currentGenomforandeReferens$.pipe( switchMap(genomforandeReferens => this.gemensamPlaneringFormService.fetchAvropInformation$(genomforandeReferens)), shareReplay(1) ); @@ -158,11 +158,11 @@ export class GemensamPlaneringFormComponent { return lastPossibleReportDay > new Date(); } - isAllowedToReport(avrop: Avrop): boolean { + isAllowedToReport(avrop: DeltagareAvrop): boolean { return this._isAfterStartDate(avrop.startDate) && this._isBeforeLastPossibleReportDay(avrop.endDate); } - notAllowedToReportWarning(avrop: Avrop): string { + notAllowedToReportWarning(avrop: DeltagareAvrop): string { if (!this._isBeforeLastPossibleReportDay(avrop.endDate)) { return 'Det går inte att göra Gemensam planering eftersom tjänsten har avslutats.'; } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.service.ts index c2c26cc..364a581 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Activity } from '@msfa-models/activity.model'; import { GemensamPlaneringPostRequest } from '@msfa-models/api/gemensam-planering.request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service'; import { Observable } from 'rxjs'; @@ -11,7 +11,7 @@ export class GemensamPlaneringFormService { constructor(private gemensamPlaneringApiService: GemensamPlaneringApiService) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.gemensamPlaneringApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts index e88acd0..fcfb31d 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts @@ -4,7 +4,7 @@ import { FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { InformativRapportCategory, InformativRapportCategoryKey } from '@msfa-enums/informativ-rapport-category.enum'; import { InformativRapportRequest } from '@msfa-models/api/informativ-rapport.request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { CustomError } from '@msfa-models/error/custom-error'; import { RequiredValidator } from '@msfa-utils/validators/required.validator'; import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; @@ -28,7 +28,7 @@ export class InformativRapportFormComponent { genomforandeReferens$: Observable = this.activatedRoute.params.pipe( map(params => +params.genomforandeReferens) ); - avrop$: Observable = this.genomforandeReferens$.pipe( + avrop$: Observable = this.genomforandeReferens$.pipe( switchMap(genomforandeReferens => this.informativRapportFormService.fetchAvropInformation$(genomforandeReferens)), shareReplay(1) ); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.service.ts index 18a9b1b..e67b48d 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { InformativRapportRequest } from '@msfa-models/api/informativ-rapport.request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { InformativRapportApiService } from '@msfa-services/api/informativ-rapport.api.service'; import { Observable } from 'rxjs'; @@ -16,7 +16,7 @@ export class InformativRapportFormService { return this.informativRapportApiService.postInformativRapport$(requestData); } - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts index ed83fbb..abd39d4 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts @@ -9,7 +9,7 @@ import { PeriodiskRedovisningRequest, } from '@msfa-models/api/periodisk-redovisning.request.model'; import { AvropPeriod } from '@msfa-models/avrop-period.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { CustomError } from '@msfa-models/error/custom-error'; import { capitalizeWords } from '@msfa-utils/capitalize-words.util'; import { formatDate, formatToDate } from '@msfa-utils/format-to-date.util'; @@ -53,7 +53,7 @@ export class PeriodiskRedovisningFormComponent implements OnInit { genomforandeReferens$: Observable = this.activatedRoute.params.pipe( map((params: Params) => +params.genomforandeReferens) ); - avrop$: Observable = this.genomforandeReferens$.pipe( + avrop$: Observable = this.genomforandeReferens$.pipe( switchMap(genomforandeReferens => this.periodiskRedovisningFormService.fetchAvropInformation$(genomforandeReferens) ), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.service.ts index 222368d..6bcf5ab 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; -import { Avrop } from '@msfa-models/avrop.model'; +import { Activity, mapResponseToActivity } from '@msfa-models/activity.model'; +import { PeriodiskRedovisningRequest } from '@msfa-models/api/periodisk-redovisning.request.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; +import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service'; import { PeriodiskRedovisningApiService } from '@msfa-services/api/periodisk-redovisning.api.service'; import { Observable } from 'rxjs'; -import { PeriodiskRedovisningRequest } from '@msfa-models/api/periodisk-redovisning.request.model'; import { map } from 'rxjs/operators'; -import { Activity, mapResponseToActivity } from '@msfa-models/activity.model'; -import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service'; @Injectable() export class PeriodiskRedovisningFormService { @@ -16,7 +16,7 @@ export class PeriodiskRedovisningFormService { private gemensamPlaneringApiService: GemensamPlaneringApiService ) {} - fetchAvropInformation$(genomforandeReferens: number): Observable { + fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts index 2bc3cec..8d06688 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts @@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { SignalRequest } from '@msfa-models/api/signal.request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { CustomError } from '@msfa-models/error/custom-error'; import { Signal } from '@msfa-models/signal.model'; import { formatDate } from '@msfa-utils/format-to-date.util'; @@ -39,7 +39,7 @@ export class SignalFormComponent { currentGenomforandeReferens$: Observable = this.activatedRoute.params.pipe( map(params => +params.genomforandeReferens) ); - avrop$: Observable = this.currentGenomforandeReferens$.pipe( + avrop$: Observable = this.currentGenomforandeReferens$.pipe( switchMap(genomforandeReferens => this.signalFormService.fetchAvropInformation$(genomforandeReferens)), shareReplay(1) ); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.service.ts index 5b77db5..d09e7ad 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { SignalRequest } from '@msfa-models/api/signal.request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { SignalApiService } from '@msfa-services/api/signal.api.service'; import { Observable } from 'rxjs'; @@ -13,7 +13,7 @@ export class SignalFormService { return this.signalApiService.postSignal$(requestData); } - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts index 2447ecd..e3e86af 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts @@ -1,13 +1,13 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { slutredovisningFormDataToSlutredovisningRequest } from '../utils/form-data-to-slutredovisning.util'; -import { CustomError } from '@msfa-models/error/custom-error'; -import { BehaviorSubject } from 'rxjs'; -import { SlutredovisningFormService } from '../slutredovisning-form.service'; import { SlutredovisningResponseMainOccupationDetails } from '@msfa-models/api/slutredovisning.response.model'; -import { Avrop } from '@msfa-models/avrop.model'; -import { map } from 'rxjs/operators'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; +import { CustomError } from '@msfa-models/error/custom-error'; import { MainOccupation, Slutredovisning } from '@msfa-models/slutredovisning.model'; +import { BehaviorSubject } from 'rxjs'; +import { map } from 'rxjs/operators'; import { SlutredovisningFormData } from '../models/slutredovisning-form-data.model'; +import { SlutredovisningFormService } from '../slutredovisning-form.service'; +import { slutredovisningFormDataToSlutredovisningRequest } from '../utils/form-data-to-slutredovisning.util'; @Component({ selector: 'msfa-slutredovisning-form-step3', @@ -17,7 +17,7 @@ import { SlutredovisningFormData } from '../models/slutredovisning-form-data.mod export class SlutredovisningFormStep3Component { @Output() backClick = new EventEmitter(); @Input() slutredovisningFormData: SlutredovisningFormData; - @Input() avrop: Avrop; + @Input() avrop: DeltagareAvrop; submitIsLoading$ = new BehaviorSubject(false); submitError$ = new BehaviorSubject(null); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts index 171c1b2..85487d3 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts @@ -1,17 +1,17 @@ import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core'; import { AbstractControl, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; +import { addDays } from 'date-fns'; import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; -import { SlutredovisningFormService } from './slutredovisning-form.service'; -import { addDays } from 'date-fns'; -import { SlutredovisningStep } from './slutredovisning-form.model'; +import { SlutredovisningFormData } from './models/slutredovisning-form-data.model'; import { SlutredovisningStep0FormData } from './slutredovisning-form-step0/slutredovisning-form-step0.component'; import { SlutredovisningStep1FormData } from './slutredovisning-form-step1/slutredovisning-form-step1.component'; import { SlutredovisningStep2FormData } from './slutredovisning-form-step2/slutredovisning-form-step2.component'; +import { SlutredovisningStep } from './slutredovisning-form.model'; +import { SlutredovisningFormService } from './slutredovisning-form.service'; import { formsToSlutredovisningFormData } from './utils/form-data-to-slutredovisning.util'; -import { SlutredovisningFormData } from './models/slutredovisning-form-data.model'; interface Params { genomforandeReferens: string; @@ -54,7 +54,7 @@ export class SlutredovisningFormComponent implements OnDestroy { ) ); - avrop$: Observable = this.genomforandeReferens$.pipe( + avrop$: Observable = this.genomforandeReferens$.pipe( switchMap(genomforandeReferens => this.slutredovisningFormService.fetchAvropInformation$(genomforandeReferens)), shareReplay(1) ); @@ -80,11 +80,11 @@ export class SlutredovisningFormComponent implements OnDestroy { return lastPossibleReportDay > new Date(); } - isAllowedToReport(avrop: Avrop): boolean { + isAllowedToReport(avrop: DeltagareAvrop): boolean { return this._isAfterStartDate(avrop.startDate) && this._isBeforeLastPossibleReportDay(avrop.endDate); } - notAllowedToReportWarning(avrop: Avrop): string { + notAllowedToReportWarning(avrop: DeltagareAvrop): string { if (!this._isBeforeLastPossibleReportDay(avrop.endDate)) { return 'Det går inte att göra Slutredovisning eftersom tjänsten har avslutats.'; } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts index 76ec493..6910c76 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Activity, mapResponseToActivity } from '@msfa-models/activity.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { SlutredovisningRequest } from '@msfa-models/api/slutredovisning.request.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { mapResponseToYrkesomrade, Yrkesomrade, yrkeToTextMap } from '@msfa-models/yrkesomrade.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service'; @@ -9,9 +10,8 @@ import { BehaviorSubject, Observable } from 'rxjs'; import { map, shareReplay } from 'rxjs/operators'; import { SlutredovisningStep0FormData } from './slutredovisning-form-step0/slutredovisning-form-step0.component'; import { SlutredovisningStep1FormData } from './slutredovisning-form-step1/slutredovisning-form-step1.component'; -import { SlutredovisningStep } from './slutredovisning-form.model'; import { SlutredovisningStep2FormData } from './slutredovisning-form-step2/slutredovisning-form-step2.component'; -import { SlutredovisningRequest } from '@msfa-models/api/slutredovisning.request.model'; +import { SlutredovisningStep } from './slutredovisning-form.model'; @Injectable() export class SlutredovisningFormService { @@ -49,7 +49,7 @@ export class SlutredovisningFormService { return this.slutredovisningApiService.submitSlutredovisning$(slutredovisning); } - fetchAvropInformation$(genomforandeReferens: number): Observable { + fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.ts index dcaa0cc..ff8a792 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Params } from '@msfa-models/api/params.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { AvvikelseReport } from '@msfa-models/avvikelse.model'; import { Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; @@ -20,7 +20,7 @@ export class AvvikelseReportViewComponent { genomforandeReferens: params.genomforandeReferens as string, })) ); - avrop$: Observable = this.params$.pipe( + avrop$: Observable = this.params$.pipe( switchMap(({ genomforandeReferens }) => this.avvikelseReportViewService.fetchAvropInformation$(+genomforandeReferens) ), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.service.ts index d18632d..56134db 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; +import { AvvikelseQuestion } from '@msfa-models/avvikelse-question.model'; +import { AvvikelseReason } from '@msfa-models/avvikelse-reason.model'; import { AvvikelseReport, mapResponseToAvvikelse } from '@msfa-models/avvikelse.model'; +import { AvvikelseApiService } from '@msfa-services/api/avvikelse-api.service'; +import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service'; import { combineLatest, Observable } from 'rxjs'; -import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { filter, map, switchMap } from 'rxjs/operators'; -import { AvvikelseReason } from '@msfa-models/avvikelse-reason.model'; -import { AvvikelseQuestion } from '@msfa-models/avvikelse-question.model'; -import { AvvikelseApiService } from '@msfa-services/api/avvikelse-api.service'; @Injectable() export class AvvikelseReportViewService { @@ -20,7 +20,7 @@ export class AvvikelseReportViewService { private avvikelseApiService: AvvikelseApiService ) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.ts index 3a5dbd9..198249c 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Params } from '@msfa-models/api/params.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { FranvaroReport } from '@msfa-models/franvaro.model'; import { Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; @@ -20,7 +20,7 @@ export class FranvaroReportViewComponent { genomforandeReferens: params.genomforandeReferens as string, })) ); - avrop$: Observable = this.params$.pipe( + avrop$: Observable = this.params$.pipe( switchMap(({ genomforandeReferens }) => this.franvaroReportViewService.fetchAvropInformation$(+genomforandeReferens) ), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.service.ts index d5ba430..659dc9f 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; +import { FranvaroReason } from '@msfa-models/franvaro-reason.model'; import { FranvaroReport, mapResponseToFranvaro } from '@msfa-models/franvaro.model'; +import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; +import { FranvaroReportApiService } from '@msfa-services/api/franvaro-report.api.service'; import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service'; import { combineLatest, Observable } from 'rxjs'; -import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; -import { FranvaroReason } from '@msfa-models/franvaro-reason.model'; -import { FranvaroReportApiService } from '@msfa-services/api/franvaro-report.api.service'; import { filter, map, switchMap } from 'rxjs/operators'; @Injectable() @@ -21,7 +21,7 @@ export class FranvaroReportViewService { private deltagareApiService: DeltagareApiService ) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.ts index fec7b78..6fdf32c 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Params } from '@msfa-models/api/params.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { GemensamPlaneringDetailed } from '@msfa-models/gemensam-planering.model'; import { Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; @@ -20,7 +20,7 @@ export class GemensamPlaneringViewComponent { genomforandeReferens: params.genomforandeReferens as string, })) ); - avrop$: Observable = this.params$.pipe( + avrop$: Observable = this.params$.pipe( switchMap(({ genomforandeReferens }) => this.gemensamPlaneringViewService.fetchAvropInformation$(+genomforandeReferens) ), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.service.ts index bd3383e..c69b86e 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; -import { Avrop } from '@msfa-models/avrop.model'; +import { Activity } from '@msfa-models/activity.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { GemensamPlaneringDetailed, mapResponseToGemensamPlaneringDetailed, } from '@msfa-models/gemensam-planering.model'; +import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; +import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service'; import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service'; import { Observable } from 'rxjs'; -import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { map, switchMap } from 'rxjs/operators'; -import { Activity } from '@msfa-models/activity.model'; -import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service'; @Injectable() export class GemensamPlaneringViewService { @@ -21,7 +21,7 @@ export class GemensamPlaneringViewService { private gemensamPlaneringApiService: GemensamPlaneringApiService ) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.ts index 69a8b07..908aa71 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Params } from '@msfa-models/api/params.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { InformativRapport } from '@msfa-models/informativ-rapport.model'; import { Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; @@ -20,7 +20,7 @@ export class InformativRapportViewComponent { genomforandeReferens: params.genomforandeReferens as string, })) ); - avrop$: Observable = this.params$.pipe( + avrop$: Observable = this.params$.pipe( switchMap(({ genomforandeReferens }) => this.informativRapportViewService.fetchAvropInformation$(+genomforandeReferens) ), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.service.ts index 7f9da02..6d3cb43 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { InformativRapport, mapResponseToInformativRapport } from '@msfa-models/informativ-rapport.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service'; @@ -10,7 +10,7 @@ import { map } from 'rxjs/operators'; export class InformativRapportViewService { constructor(private handlingarApiService: HandlingarApiService, private deltagareApiService: DeltagareApiService) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.ts index bde4e2f..64623c1 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Params } from '@msfa-models/api/params.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { PeriodiskRedovisning, PeriodiskRedovisningActivity } from '@msfa-models/periodisk-redovisning.model'; import { capitalizeWords } from '@msfa-shared/utils/capitalize-words.util'; import { formatDate, formatToDate } from '@msfa-shared/utils/format-to-date.util'; @@ -22,7 +22,7 @@ export class PeriodiskRedovisningViewComponent { genomforandeReferens: params.genomforandeReferens as string, })) ); - avrop$: Observable = this.params$.pipe( + avrop$: Observable = this.params$.pipe( switchMap(({ genomforandeReferens }) => this.periodiskRedovisningViewService.fetchAvropInformation$(+genomforandeReferens) ), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.service.ts index 66a9896..53c06ab 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Activity } from '@msfa-models/activity.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { mapResponseToPeriodiskRedovisning, PeriodiskRedovisning } from '@msfa-models/periodisk-redovisning.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { GemensamPlaneringApiService } from '@msfa-services/api/gemensam-planering-api.service'; @@ -18,7 +18,7 @@ export class PeriodiskRedovisningViewService { private deltagareApiService: DeltagareApiService ) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.ts index 071ab4d..7e660d1 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.ts @@ -1,11 +1,11 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Params } from '@msfa-models/api/params.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; +import { Slutredovisning } from '@msfa-models/slutredovisning.model'; import { Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; import { SlutredovisningViewService } from './slutredovisning-view.service'; -import { Slutredovisning } from '@msfa-models/slutredovisning.model'; @Component({ selector: 'msfa-slutredovisning-view', @@ -20,7 +20,7 @@ export class SlutredovisningViewComponent { genomforandeReferens: params.genomforandeReferens as string, })) ); - avrop$: Observable = this.params$.pipe( + avrop$: Observable = this.params$.pipe( switchMap(({ genomforandeReferens }) => this.slutredovisningViewService.fetchAvropInformation$(+genomforandeReferens) ), diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.service.ts index 36bcd5b..35a62b7 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.service.ts @@ -1,21 +1,16 @@ import { Injectable } from '@angular/core'; -import { Avrop } from '@msfa-models/avrop.model'; +import { SlutredovisningResponse } from '@msfa-models/api/slutredovisning.response.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; +import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { HandlingarApiService } from '@msfa-services/api/handlingar.api.service'; import { Observable } from 'rxjs'; -import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; -import { SlutredovisningApiService } from '@msfa-services/api/slutredovisning.api.service'; -import { SlutredovisningResponse } from '@msfa-models/api/slutredovisning.response.model'; import { map } from 'rxjs/operators'; @Injectable() export class SlutredovisningViewService { - constructor( - private handlingarApiService: HandlingarApiService, - private deltagareApiService: DeltagareApiService, - private gemensamPlaneringApiService: SlutredovisningApiService - ) {} + constructor(private handlingarApiService: HandlingarApiService, private deltagareApiService: DeltagareApiService) {} - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/avrop.response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/avrop.response.model.ts index 80fe551..880b532 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/api/avrop.response.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/api/avrop.response.model.ts @@ -1,6 +1,6 @@ import { PaginationMeta } from '@msfa-models/pagination-meta.model'; -export interface AvropResponse { +export interface DeltagareAvropResponse { id: string; fullName: string; tjanst: string; @@ -19,8 +19,49 @@ export interface AvropResponse { handledare: string; hasAvbrott: boolean; hasGemensamPlanering: boolean; + kommun: string; + personnummer: string; +} - //personnummer: string; +export interface AvropResponse { + id: string; + deltagare: string; + genomforandeReferens: number; + kommun: string; + adress: string; + tjansteNamn: string; + startdatumAvrop: Date; + slutdatumAvrop: Date; + tolkbehov: string | null; + sprakstod: string | null; + sparkod: string; + + // These are not used, but are available inside the response + leverantorId: number; + organisationsnummer: string; + utforandeVerksamhetId: number; + utforandeverksamhet: string; + kommunKod: string; + utforandeAdressId: number; + bokningsId: number; + ordernummer: string; + personnummer: string; + sokandeId: number; + tjanstekod: string; + deltagandeGrad: number; + sparNamn: string; + aktnummerDiariet: string; + handledareCiamUserId: string | null; + handledare: string | null; + exported: boolean; + avbrottHandelseId: string | null; + avbrottHandelse: string | null; + handelser: unknown[] | null; + handlingar: unknown[] | null; + recievedTimestamp: Date; + isDeltagare: boolean; + hasGemensamPlanering: boolean; + hasAvbrott: boolean; } export interface AvropAndMetaResponse { diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts index f68b9a9..b5d9106 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts @@ -1,5 +1,5 @@ import { PaginationMeta } from '@msfa-models/pagination-meta.model'; -import { AvropResponse } from './avrop.response.model'; +import { DeltagareAvropResponse } from './avrop.response.model'; import { ContactInformationResponse } from './contact-information.response.model'; import { DisabilitiesResponse } from './disabilities.response.model'; import { DriversLicenseResponse } from './drivers-license.response.model'; @@ -32,7 +32,7 @@ export interface DeltagareResponse { workLanguages: WorkLanguagesResponse; disabilities: DisabilitiesResponse; workExperiences: WorkExperiencesResponse; - avropInformation: AvropResponse; + avropInformation: DeltagareAvropResponse; } export interface DeltagareCompactApiResponse { diff --git a/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts b/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts index 4575cea..36ca7a6 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts @@ -1,8 +1,9 @@ import { TrackName } from '@msfa-enums/track-name.enum'; -import { AvropResponse } from './api/avrop.response.model'; +import { mapStringToSsn } from '@msfa-shared/utils/map-string-to-ssn.util'; +import { AvropResponse, DeltagareAvropResponse } from './api/avrop.response.model'; import { PaginationMeta } from './pagination-meta.model'; -export interface Avrop { +export interface DeltagareAvrop { id: string; fullName: string; tjanst: string; @@ -22,9 +23,22 @@ export interface Avrop { receivedTimestamp: Date; hasGemensamPlanering: boolean; hasAvbrott: boolean; - - ssn: string; // personnummer kommun: string; + ssn: string; +} + +export interface Avrop { + id: string; + fullName: string; + tjanst: string; + startDate: Date; + endDate: Date; + sprakstod: string; + tolkbehov: string; + utforandeAdress: string; + kommun: string; + trackName: TrackName; + genomforandeReferens: number; } export interface AvropAndMeta { @@ -32,7 +46,37 @@ export interface AvropAndMeta { meta: PaginationMeta; } -export function mapAvropResponseToAvrop(data: AvropResponse): Avrop { +export function mapResponseToAvrop(data: AvropResponse): Avrop { + const { + id, + deltagare, + tjansteNamn, + startdatumAvrop, + slutdatumAvrop, + sprakstod, + tolkbehov, + adress, + kommun, + sparkod, + genomforandeReferens, + } = data; + + return { + id, + fullName: deltagare, + tjanst: tjansteNamn, + startDate: new Date(startdatumAvrop), + endDate: new Date(slutdatumAvrop), + sprakstod, + tolkbehov, + utforandeAdress: adress, + kommun, + trackName: (TrackName[sparkod] || TrackName.UNKNOWN) as TrackName, + genomforandeReferens, + }; +} + +export function mapResponseToDeltagareAvrop(data: DeltagareAvropResponse): DeltagareAvrop { const { id, fullName, @@ -52,9 +96,8 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop { handledare, hasAvbrott, hasGemensamPlanering, - - // kommun - // personnummer, + kommun, + personnummer, } = data; return { @@ -68,12 +111,10 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop { sprakstod, utforandeVerksamhet, utforandeAdress, - // kommun, - kommun: '', + kommun: kommun || '', trackCode: sparkod, trackName: (TrackName[sparkod] || TrackName.UNKNOWN) as TrackName, - // ssn: mapStringToSsn(personnummer), - ssn: '', + ssn: mapStringToSsn(personnummer), genomforandeReferens, participationFrequency, handledareCiamUserId, diff --git a/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts b/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts index 70aafca..139d0f8 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts @@ -1,6 +1,6 @@ import { Address } from './address.model'; import { DeltagareCompactResponse, DeltagareResponse } from './api/deltagare.response.model'; -import { Avrop, mapAvropResponseToAvrop } from './avrop.model'; +import { DeltagareAvrop, mapResponseToDeltagareAvrop } from './avrop.model'; import { mapResponseToContactInformation } from './contact-information.model'; import { Disability, mapResponseToDisability } from './disability.model'; import { DriversLicense, mapResponseToDriversLicense } from './drivers-license.model'; @@ -42,7 +42,7 @@ export interface Deltagare { disabilities: Disability[]; workLanguages: string[]; workExperiences: WorkExperience[]; - avropInformation: Avrop; + avropInformation: DeltagareAvrop; } export interface DeltagareCompactData { @@ -105,6 +105,6 @@ export function mapResponseToDeltagare(data: DeltagareResponse): Deltagare { workExperiences: workExperiences && workExperiences.arbetslivserfarenheter.map(workExperience => mapResponseToWorkExperience(workExperience)), - avropInformation: avropInformation && mapAvropResponseToAvrop(avropInformation), + avropInformation: avropInformation && mapResponseToDeltagareAvrop(avropInformation), }; } diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/avrop-api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/avrop-api.service.ts index 29937d5..cfba0f2 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/api/avrop-api.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/api/avrop-api.service.ts @@ -5,9 +5,8 @@ import { AvropFilterResponse } from '@msfa-models/api/avrop-filter.response.mode import { AvropAndMetaResponse } from '@msfa-models/api/avrop.response.model'; import { Params } from '@msfa-models/api/params.model'; import { AvropFilter, mapResponseToAvropFilter } from '@msfa-models/avrop-filter.model'; -import { Avrop, AvropAndMeta, mapAvropResponseToAvrop } from '@msfa-models/avrop.model'; +import { Avrop, AvropAndMeta, mapResponseToAvrop } from '@msfa-models/avrop.model'; import { CustomError, errorToCustomError } from '@msfa-models/error/custom-error'; -import { Handledare } from '@msfa-models/handledare.model'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { catchError, filter, map } from 'rxjs/operators'; @@ -17,7 +16,6 @@ import { catchError, filter, map } from 'rxjs/operators'; export class AvropApiService { private _apiBaseUrl = `${environment.api.url}/avrop`; private _lockedAvropSnapshot$ = new BehaviorSubject(null); - private _availableHandledareSnapshot$ = new BehaviorSubject(null); private _showUnauthorizedError$ = new BehaviorSubject(false); public showUnauthorizedError$: Observable = this._showUnauthorizedError$.asObservable(); @@ -31,14 +29,14 @@ export class AvropApiService { return this.httpClient .get(`${this._apiBaseUrl}`, { params }) .pipe( - map(({ data, meta }) => ({ data: data.map(avrop => mapAvropResponseToAvrop(avrop)), meta })), + map(({ data, meta }) => ({ data: data.map(avrop => mapResponseToAvrop(avrop)), meta })), catchError((error: Error & { status: number }) => { if (error.status === 403) { this._showUnauthorizedError$.next(true); return of(null as null); } else { throw new CustomError( - errorToCustomError({ ...error, message: `Kunde inte hämta deltagare.\n\n${error.message}` }) + errorToCustomError({ ...error, message: `Kunde inte hämta nya deltagare.\n\n${error.message}` }) ); } }) diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts index edb09a5..ed91e6c 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from '@msfa-environment'; -import { AvropResponse } from '@msfa-models/api/avrop.response.model'; +import { DeltagareAvropResponse } from '@msfa-models/api/avrop.response.model'; import { ContactInformationResponse } from '@msfa-models/api/contact-information.response.model'; import { DeltagareCompactApiResponse } from '@msfa-models/api/deltagare.response.model'; import { DisabilityResponse } from '@msfa-models/api/disability.response.model'; @@ -13,7 +13,7 @@ import { ReportsDataResponse } from '@msfa-models/api/report.response.model'; import { TranslatorResponse } from '@msfa-models/api/translator.response.model'; import { WorkExperiencesResponse } from '@msfa-models/api/work-experiences.response.model'; import { WorkLanguagesResponse } from '@msfa-models/api/work-languages.response.model'; -import { Avrop, mapAvropResponseToAvrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop, mapResponseToDeltagareAvrop } from '@msfa-models/avrop.model'; import { ContactInformation, mapResponseToContactInformation } from '@msfa-models/contact-information.model'; import { DeltagareCompactData, mapResponseToDeltagareCompact } from '@msfa-models/deltagare.model'; import { Disability, mapResponseToDisability } from '@msfa-models/disability.model'; @@ -217,14 +217,16 @@ export class DeltagareApiService { ); } - public fetchAvropInformation$(genomforandeReferens: number): Observable { - return this.httpClient.get<{ data: AvropResponse }>(`${this._apiBaseUrl}/${genomforandeReferens}/avrop`).pipe( - map(({ data }) => mapAvropResponseToAvrop(data)), - catchError((error: Error) => { - throw new CustomError( - errorToCustomError({ ...error, message: `Kunde inte hämta avropsinformation.\n\n${error.message}` }) - ); - }) - ); + public fetchAvropInformation$(genomforandeReferens: number): Observable { + return this.httpClient + .get<{ data: DeltagareAvropResponse }>(`${this._apiBaseUrl}/${genomforandeReferens}/avrop`) + .pipe( + map(({ data }) => mapResponseToDeltagareAvrop(data)), + catchError((error: Error) => { + throw new CustomError( + errorToCustomError({ ...error, message: `Kunde inte hämta avropsinformation.\n\n${error.message}` }) + ); + }) + ); } } diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/franvaro-report.api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/franvaro-report.api.service.ts index 0c7a355..9da22d8 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/api/franvaro-report.api.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/api/franvaro-report.api.service.ts @@ -4,7 +4,7 @@ import { ErrorType } from '@msfa-enums/error-type.enum'; import { environment } from '@msfa-environment'; import { FranvaroReasonResponse } from '@msfa-models/api/franvaro-reason.response.model'; import { FranvaroReportRequest } from '@msfa-models/api/franvaro-request.model'; -import { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { CustomError, errorToCustomError } from '@msfa-models/error/custom-error'; import { FranvaroReason, mapResponseToFranvaroReason } from '@msfa-models/franvaro-reason.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; @@ -44,7 +44,7 @@ export class FranvaroReportApiService { ); } - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/gemensam-planering-api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/gemensam-planering-api.service.ts index ee53842..547ea2c 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/api/gemensam-planering-api.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/api/gemensam-planering-api.service.ts @@ -5,7 +5,7 @@ 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 { Avrop } from '@msfa-models/avrop.model'; +import { DeltagareAvrop } from '@msfa-models/avrop.model'; import { CustomError, errorToCustomError } from '@msfa-models/error/custom-error'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { Observable } from 'rxjs'; @@ -31,7 +31,7 @@ export class GemensamPlaneringApiService { ); } - public fetchAvropInformation$(genomforandeReferens: number): Observable { + public fetchAvropInformation$(genomforandeReferens: number): Observable { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); }