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

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

apps/mina-sidor-fa/src/app/shared/models/api/avvikelse-response.model.ts

@@ -0,0 +1,15 @@
+export interface AvvikelseQuestionResponse {
+  fraga: string;
+  svar: string;
+}
+
+export interface AvvikelseResponse {
+  avvikelseOrsakskod: string;
+  frageformular: AvvikelseQuestionResponse[];
+  rapporteringsdatum: string;
+}
+
+export interface AvvikelseReportResponse {
+  genomforandeReferens: number;
+  avvikelseAlternativ: AvvikelseResponse;
+}

apps/mina-sidor-fa/src/app/shared/models/api/franvaro-response.model.ts

@@ -0,0 +1,20 @@
+export interface FranvaroResponse {
+  avvikelseOrsaksKod: string;
+  datum: string;
+  heldag: boolean;
+  startTid: string;
+  slutTid: string;
+  alternativForKandaOrsaker: {
+    typ: string;
+    motivering: string;
+  } | null;
+  forvantadNarvaro: {
+    startTid: string;
+    slutTid: string;
+  };
+}
+
+export interface FranvaroReportResponse {
+  genomforandeReferens: number;
+  franvaro: FranvaroResponse;
+}

apps/mina-sidor-fa/src/app/shared/models/api/gemensam-planering.response.model.ts

@@ -0,0 +1,5 @@
+export interface GemensamPlaneringResponse {
+  genomforandeReferens: string;
+  distans: boolean;
+  aktivitetsIds: number[];
+}

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

@@ -1,29 +1,64 @@
-import { FranvaroAlternativ } from './franvaro-alternativ.model';
 import { Fraga } from '@msfa-models/fraga.model';
+import { AvvikelseResponse } from './api/avvikelse-response.model';
+import { FragorForAvvikelser } from './fragor-for-avvikelser.model';
+import { FranvaroAlternativ } from './franvaro-alternativ.model';
+import { OrsaksKoderAvvikelse } from './orsaks-koder-avvikelse.model';
 
-export interface AvvikelseAlternativ {
+export interface AvvikelseQuestion {
+  question: string;
+  answer: string;
+}
+
+export interface Avvikelse {
+  reason: string;
+  questions: AvvikelseQuestion[];
+  date: Date;
+}
+
+export interface AvvikelseReport {
+  genomforandeReferens: number;
+  avvikelse: Avvikelse;
+}
+
+export interface AvvikelseAlternativ_OLD {
   avvikelseorsakskod: string;
   frageformular: Fraga[];
   rapporteringsdatum: string;
 }
 
-export interface Avvikelse {
+export interface Avvikelse_OLD {
   genomforandeReferens: number;
-  avvikelseAlternativ?: AvvikelseAlternativ;
-  franvaro?: FranvaroAlternativ;
+  avvikelseAlternativ?: AvvikelseAlternativ_OLD;
 }
 
-export interface AvvikelseRequestData {
+export interface AvvikelseRequestData_OLD {
   genomforandeReferens: number;
-  avvikelseAlternativ: AvvikelseAlternativ;
+  avvikelseAlternativ: AvvikelseAlternativ_OLD;
 }
 
-export interface FranvaroRequestData {
+export interface FranvaroRequestData_OLD {
   genomforandeReferens: number;
   franvaro: FranvaroAlternativ;
 }
 
-export function mapAvvikelseRequestDataToAvvikelse(data: AvvikelseRequestData): Avvikelse {
+export function mapResponseToAvvikelse(
+  data: AvvikelseResponse,
+  reasons: OrsaksKoderAvvikelse[],
+  questions: FragorForAvvikelser[]
+): Avvikelse {
+  const { avvikelseOrsakskod, rapporteringsdatum, frageformular } = data;
+
+  return {
+    reason: reasons.find(reason => reason.id === avvikelseOrsakskod).name,
+    questions: frageformular.map(fraga => ({
+      question: questions.find(question => question.id === fraga.fraga).name,
+      answer: fraga.svar,
+    })),
+    date: new Date(rapporteringsdatum),
+  };
+}
+
+export function mapAvvikelseRequestDataToAvvikelse_OLD(data: AvvikelseRequestData_OLD): Avvikelse_OLD {
   return data;
   // const { genomforandeReferens, avvikelseAlternativ } = data;
   //

apps/mina-sidor-fa/src/app/shared/models/franvaro.model.ts

@@ -1,3 +1,6 @@
+import { FranvaroResponse } from './api/franvaro-response.model';
+import { OrsaksKoderFranvaro } from './orsaks-koder-franvaro.model';
+
 export interface Franvaro {
   reason: string;
   date: Date;
@@ -9,3 +12,30 @@ export interface Franvaro {
   otherKnownReason: string;
   knownReasonComment: string;
 }
+
+export interface FranvaroReport {
+  genomforandeReferens: number;
+  franvaro: Franvaro;
+}
+
+export function mapResponseToFranvaro(
+  data: FranvaroResponse,
+  reasons: OrsaksKoderFranvaro[],
+  otherKnownReasons: OrsaksKoderFranvaro[]
+): Franvaro {
+  const { avvikelseOrsaksKod, datum, heldag, startTid, slutTid, alternativForKandaOrsaker, forvantadNarvaro } = data;
+
+  return {
+    reason: reasons.find(reason => reason.value.toString() === avvikelseOrsaksKod).name,
+    date: new Date(datum),
+    wholeDay: heldag,
+    startTime: startTid,
+    endTime: slutTid,
+    otherKnownReason: alternativForKandaOrsaker
+      ? otherKnownReasons.find(reason => reason.value.toString() === alternativForKandaOrsaker.typ).name
+      : null,
+    knownReasonComment: alternativForKandaOrsaker?.motivering || null,
+    expectedPresenceStartTime: forvantadNarvaro.startTid,
+    expectedPresenceEndTime: forvantadNarvaro.slutTid,
+  };
+}

apps/mina-sidor-fa/src/app/shared/models/gemensam-planering.model.ts

@@ -1,4 +1,6 @@
+import { Activity } from './activity.model';
 import { GemensamPlaneringPostRequest } from './api/gemensam-planering.request.model';
+import { GemensamPlaneringResponse } from './api/gemensam-planering.response.model';
 
 export interface GemensamPlanering {
   genomforandeReferens: number;
@@ -6,6 +8,12 @@ export interface GemensamPlanering {
   activityIds: number[];
 }
 
+export interface GemensamPlaneringDetailed {
+  genomforandeReferens: number;
+  distance: boolean;
+  activities: string[];
+}
+
 export function mapGemensamPlaneringToGemensamPlaneringPostRequest(
   gemensamPlanering: GemensamPlanering
 ): GemensamPlaneringPostRequest {
@@ -17,3 +25,16 @@ export function mapGemensamPlaneringToGemensamPlaneringPostRequest(
     aktivitetsIds: activityIds,
   };
 }
+
+export function mapResponseToGemensamPlaneringDetailed(
+  data: GemensamPlaneringResponse,
+  activities: Activity[]
+): GemensamPlaneringDetailed {
+  const { genomforandeReferens, distans, aktivitetsIds } = data;
+
+  return {
+    genomforandeReferens: +genomforandeReferens,
+    distance: distans,
+    activities: aktivitetsIds.map(id => activities.find(activity => activity.id === id).name),
+  };
+}

apps/mina-sidor-fa/src/app/shared/models/report.model.ts

@@ -1,5 +1,6 @@
 import { ReportType } from '@msfa-enums/report-type.enum';
 import { ReportResponse } from './api/report.response.model';
+import { Franvaro } from './franvaro.model';
 import { PaginationMeta } from './pagination-meta.model';
 
 export interface Report {
@@ -11,6 +12,11 @@ export interface Report {
   ciamUserId: string;
 }
 
+export interface ReportDetail {
+  genomforandeReferens: string;
+  franvaro?: Franvaro;
+}
+
 export interface ReportsData {
   data: Report[];
   meta: PaginationMeta;

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

@@ -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();
   }
 }

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

@@ -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();
   }
 }

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

@@ -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();
   }

apps/mina-sidor-fa/src/app/shared/services/api/report.api.service.ts

@@ -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),
+            }))
+          );
+      })
+    );
+  }
+}

apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts

@@ -6,7 +6,7 @@ export function mapPathsToBreadcrumbs(
   paths: string[],
   startBreadcrumb?: NavigationBreadcrumbsItem
 ): NavigationBreadcrumbsItem[] {
-  const breadcrumbs = [
+  let breadcrumbs = [
     ...(startBreadcrumb ? [startBreadcrumb] : []),
     ...paths.map((path, index) => ({
       text: mapPathToPageName(path),
@@ -24,7 +24,11 @@ export function mapPathsToBreadcrumbs(
     breadcrumbs[breadcrumbs.length - 1].text = 'Redigera personalkonto';
   } else if (isDeltagareCardRoute(paths)) {
     breadcrumbs[breadcrumbs.length - 1].text = 'Deltagarinformation';
+  } else if (isDeltagareReportingFormRoute(paths)) {
+    breadcrumbs[breadcrumbs.length - 2].text = 'Deltagarinformation';
+    breadcrumbs[breadcrumbs.length - 1].text = `Skapa ${DELTAGARE_REPORTING_ROUTES[paths[paths.length - 1]] as string}`;
   } else if (isDeltagareReportingRoute(paths)) {
+    breadcrumbs = breadcrumbs.slice(0, -1);
     breadcrumbs[breadcrumbs.length - 2].text = 'Deltagarinformation';
   }
 
@@ -43,6 +47,10 @@ function isDeltagareCardRoute(paths: string[]): boolean {
   return paths.length === 2 && paths[0] === 'deltagare';
 }
 
-function isDeltagareReportingRoute(paths: string[]): boolean {
+function isDeltagareReportingFormRoute(paths: string[]): boolean {
   return paths.length === 3 && paths[0] === 'deltagare' && paths[2] in DELTAGARE_REPORTING_ROUTES;
 }
+
+function isDeltagareReportingRoute(paths: string[]): boolean {
+  return paths.length === 4 && paths[0] === 'deltagare' && paths[2] in DELTAGARE_REPORTING_ROUTES;
+}