From 4d3d73b54a6c711d4a51482761301f7175535a43 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Wed, 6 Oct 2021 12:33:38 +0200 Subject: [PATCH] Removed some unused models and services --- ...ltagare-periodisk-redovisning.component.ts | 7 +++--- .../src/app/shared/models/activity.model.ts | 6 ++--- .../models/api/activity-response.model.ts | 5 ---- .../models/api/activity.response.model.ts | 4 ++++ .../shared/models/gemensam-planering.model.ts | 12 ---------- .../services/api/activities-api.service.ts | 23 ------------------ .../services/api/activity-api.service.ts | 24 ------------------- .../api/gemensam-planering-api.service.ts | 3 ++- 8 files changed, 12 insertions(+), 72 deletions(-) delete mode 100644 apps/mina-sidor-fa/src/app/shared/models/api/activity-response.model.ts create mode 100644 apps/mina-sidor-fa/src/app/shared/models/api/activity.response.model.ts delete mode 100644 apps/mina-sidor-fa/src/app/shared/services/api/activities-api.service.ts delete mode 100644 apps/mina-sidor-fa/src/app/shared/services/api/activity-api.service.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts index 75bed36..4de5f46 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts @@ -1,7 +1,8 @@ import { RadiobuttonGroupDirection } from '@af/digi-ng/_form/form-radiobutton-group'; import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { AbstractControl, FormArray, FormControl, FormGroup, Validators } from '@angular/forms'; +import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; import { Activity, SubActivity } from '@msfa-models/activity.model'; +import { RequiredValidator } from '@msfa-utils/validators/required.validator'; @Component({ selector: 'msfa-deltagare-periodisk-redovisning', @@ -38,8 +39,8 @@ export class DeltagarePeriodiskRedovisningComponent { initializePeriodiskRedovisningFormGroup(activitiesList: Activity[]): void { this.periodiskRedovisningFormGroup = new FormGroup({ - lamnatJobbForslag: new FormControl(null, [Validators.required]), - providedSprakStod: new FormControl(null, [Validators.required]), + lamnatJobbForslag: new FormControl(null, [RequiredValidator('lamnatJobbForslag')]), + providedSprakStod: new FormControl(null, [RequiredValidator('providedSprakStod')]), activities: new FormArray([]), }); this.getActivitesFormArray(activitiesList); diff --git a/apps/mina-sidor-fa/src/app/shared/models/activity.model.ts b/apps/mina-sidor-fa/src/app/shared/models/activity.model.ts index 6433cb7..8c569fc 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/activity.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/activity.model.ts @@ -1,3 +1,5 @@ +import { ActivityResponse } from './api/activity.response.model'; + export interface Activity { id: number; name: string; @@ -7,10 +9,6 @@ export interface SubActivity { name: string; description: string; } -export interface ActivityResponse { - id: number; - name: string; -} export function mapResponseToActivity(data: ActivityResponse): Activity { const { id, name } = data; diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/activity-response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/activity-response.model.ts deleted file mode 100644 index c4d7d29..0000000 --- a/apps/mina-sidor-fa/src/app/shared/models/api/activity-response.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface ActivityResponse { - aktivitets_id: string; - aktivitets_namn: string; - beskrivning?: string; -} diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/activity.response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/activity.response.model.ts new file mode 100644 index 0000000..75291b0 --- /dev/null +++ b/apps/mina-sidor-fa/src/app/shared/models/api/activity.response.model.ts @@ -0,0 +1,4 @@ +export interface ActivityResponse { + id: number; + name: string; +} diff --git a/apps/mina-sidor-fa/src/app/shared/models/gemensam-planering.model.ts b/apps/mina-sidor-fa/src/app/shared/models/gemensam-planering.model.ts index 895432e..3c92455 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/gemensam-planering.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/gemensam-planering.model.ts @@ -6,18 +6,6 @@ export interface GemensamPlanering { activityIds: number[]; } -export interface Activity { - activityId: string; - name: string; - description: string; -} - -export interface SubActivity { - subActivityId: string; - name: string; - description: string; -} - export function mapGemensamPlaneringToGemensamPlaneringPostRequest( gemensamPlanering: GemensamPlanering ): GemensamPlaneringPostRequest { diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/activities-api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/activities-api.service.ts deleted file mode 100644 index f4ce068..0000000 --- a/apps/mina-sidor-fa/src/app/shared/services/api/activities-api.service.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { environment } from '@msfa-environment'; -import { Activity, ActivityResponse, mapResponseToActivity } from '@msfa-models/activity.model'; -import { Observable } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; - -@Injectable({ - providedIn: 'root', -}) -export class ActivitiesApiService { - private _apiBaseUrl = `${environment.api.url}`; - - constructor(private httpClient: HttpClient) {} - - public getActivities$(): Observable { - // endpoint ska uppdateras - return this.httpClient.get<{ data: ActivityResponse[] }>(`${this._apiBaseUrl}/activities`).pipe( - filter(response => !!response?.data), - map(({ data }) => data.map(aktivitet => mapResponseToActivity(aktivitet))) - ); - } -} diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/activity-api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/activity-api.service.ts deleted file mode 100644 index e850bd8..0000000 --- a/apps/mina-sidor-fa/src/app/shared/services/api/activity-api.service.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { environment } from '@msfa-environment'; -import { Activity, mapResponseToActivity } from '@msfa-models/activity.model'; -import { ActivityResponse } from '@msfa-models/api/activity-response.model'; -import { Observable } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; - -@Injectable({ - providedIn: 'root', -}) -export class ActivityApiService { - private _apiBaseUrl = `${environment.api.url}`; - - public getActivities$(): Observable { - // endpoint ska uppdateras - return this.httpClient.get<{ data: ActivityResponse[] }>(`${this._apiBaseUrl}/aktiviteter`).pipe( - filter(response => !!response?.data), - map(({ data }) => data.map(aktivitet => mapResponseToActivity(aktivitet))) - ); - } - - constructor(private httpClient: HttpClient) {} -} 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 d60afa1..7122570 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 @@ -1,7 +1,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from '@msfa-environment'; -import { Activity, ActivityResponse, mapResponseToActivity } from '@msfa-models/activity.model'; +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 { CustomError, errorToCustomError } from '@msfa-models/error/custom-error';