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

Removed a lot of unused models, services and enums

Browse Source
This commit is contained in:
Erik Tiekstra
2021-10-06 12:51:12 +02:00
parent 4d3d73b54a
commit 19a3b05e5f
24 changed files with 63 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.ts
View File

@@ -14,7 +14,6 @@ import { BehaviorSubject, Observable } from 'rxjs';
})
export class EmployeeCardComponent implements OnDestroy {
private _employeeId$ = new BehaviorSubject<string>(this.activatedRoute.snapshot.params['employeeId']);
private _pendingSelectedParticipants$ = new BehaviorSubject<string[]>([]);
employee$: Observable<Employee> = this.employeeService.employee$;
lastUpdatedEmployeeId$: Observable<string> = this.employeeService.lastUpdatedEmployeeId$;
allRoles: Role[] = this.roleService.allRoles;
@@ -37,10 +36,6 @@ export class EmployeeCardComponent implements OnDestroy {
return this._employeeId$.getValue();
}
get pendingSelectedParticipants(): string[] {
return this._pendingSelectedParticipants$.getValue();
}
isAccordionExpanded(id: number): boolean {
return this.accordionsExpanded.includes(id);
}

4
apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts
View File

@@ -10,7 +10,7 @@ import {
OnInit,
Output,
SimpleChanges,
ViewChild,
ViewChild
} from '@angular/core';
import { AbstractControl, FormControl, FormGroup } from '@angular/forms';
import { RoleEnum } from '@msfa-enums/role.enum';
@@ -23,7 +23,7 @@ import { UtforandeVerksamhet } from '@msfa-models/utforande-verksamhet.model';
import { UtforandeVerksamheterService } from '@msfa-services/utforande-verksamheter/utforande-verksamheter.service';
import { ValidationErrorLink } from '@msfa-shared/components/error-list/error-list.component';
import { TreeNodesSelectorService } from '@msfa-shared/components/tree-nodes-selector/services/tree-nodes-selector.service';
import { uuid } from '@msfa-utils/uuid';
import { uuid } from '@msfa-utils/uuid.util';
import { EmployeeValidator } from '@msfa-utils/validators/employee.validator';
import { EmployeeFormService } from '../services/employee-form.service';

11
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelse/components/deltagare-orsaks-form/deltagare-orsaks-form.component.ts
View File

@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { Alternative } from '@msfa-enums/alternative.enum';
import { FranvaroOrsaksKodEnum } from '@msfa-enums/franvaro-orsak-kod.enum';
import { ReportType } from '@msfa-enums/report-type.enum';
import { OrsaksKoderAvvikelse } from '@msfa-models/orsaks-koder-avvikelse.model';
import { OrsaksKoderFranvaro } from '@msfa-models/orsaks-koder-franvaro.model';
@@ -9,7 +9,7 @@ import { OrsaksKoderFranvaro } from '@msfa-models/orsaks-koder-franvaro.model';
selector: 'msfa-deltagare-orsaks-form',
templateUrl: './deltagare-orsaks-form.component.html',
styleUrls: ['./deltagare-orsaks-form.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class DeltagareOrsaksFormComponent implements OnChanges {
@Input() franvaroOrsaker: OrsaksKoderFranvaro[] | null = null;
@@ -26,8 +26,9 @@ export class DeltagareOrsaksFormComponent implements OnChanges {
}
get showAndraKandaOrsaker(): boolean {
return this.selectedAlternative === Alternative.FRANVARO &&
+this.orsakerFormGroup.get('orsaker')?.value === FranvaroOrsaksKodEnum.AnnanKandOrsak;
return (
this.selectedAlternative === ReportType.FRANVARO &&
+this.orsakerFormGroup.get('orsaker')?.value === FranvaroOrsaksKodEnum.AnnanKandOrsak
);
}
}

20
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelse/deltagare-avvikelse.component.ts
View File

@@ -3,7 +3,7 @@ import { FormTextareaSize } from '@af/digi-ng/_form/form-textarea';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { AbstractControl, FormControl, FormGroup } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { Alternative } from '@msfa-enums/alternative.enum';
import { ReportType } from '@msfa-enums/report-type.enum';
import { ConfirmDialog } from '@msfa-enums/confirm-dialog.enum';
import { DayOrPartOfDay } from '@msfa-enums/day-or-part-of-day.enum';
import { FranvaroOrsaksKodEnum } from '@msfa-enums/franvaro-orsak-kod.enum';
@@ -159,7 +159,7 @@ export class DeltagareAvvikelseComponent implements OnInit {
get showDescription(): boolean {
return (
(this.alternativeFormControl.value as string) == Alternative.FRANVARO &&
(this.alternativeFormControl.value as string) == ReportType.FRANVARO &&
+this.orsakerFormControl.value === FranvaroOrsaksKodEnum.AnnanKandOrsak &&
+this.andraKandaOrsakerFormControl.value === KandaOrsakerEnum.AnnanOrsak
);
@@ -167,7 +167,7 @@ export class DeltagareAvvikelseComponent implements OnInit {
get showFragor(): boolean {
return (
(this.alternativeFormControl.value as string) === Alternative.AVVIKELSE &&
(this.alternativeFormControl.value as string) === ReportType.AVVIKELSE &&
(this.orsakerFormControl.value as boolean)
);
}
@@ -178,14 +178,14 @@ export class DeltagareAvvikelseComponent implements OnInit {
get showDayOrPartOfDayPicker(): boolean {
return (
(this.alternativeFormControl.value as string) === Alternative.FRANVARO &&
(this.alternativeFormControl.value as string) === ReportType.FRANVARO &&
(this.orsakerFormControl.value as boolean)
);
}
get showTimePicker(): boolean {
return (
(this.alternativeFormControl.value as string) === Alternative.FRANVARO &&
(this.alternativeFormControl.value as string) === ReportType.FRANVARO &&
(this.dayOrPartOfDayFormControl.value as string) === DayOrPartOfDay.DEL_AV_DAG
);
}
@@ -233,9 +233,9 @@ export class DeltagareAvvikelseComponent implements OnInit {
sokandeId: +this.activatedRoute.snapshot.params['genomforandeReferens'],
};
if ((this.alternativeFormControl.value as string) === Alternative.AVVIKELSE) {
if ((this.alternativeFormControl.value as string) === ReportType.AVVIKELSE) {
postAvvikelse['avvikelsealternativ'] = this.avvikelse;
} else if ((this.alternativeFormControl.value as string) == Alternative.FRANVARO) {
} else if ((this.alternativeFormControl.value as string) == ReportType.FRANVARO) {
postAvvikelse['franvaro'] = this.franvaro;
}
@@ -250,12 +250,12 @@ export class DeltagareAvvikelseComponent implements OnInit {
}
setAlternative(): void {
if ((this.alternativeFormControl.value as string) == Alternative.FRANVARO) {
if ((this.alternativeFormControl.value as string) == ReportType.FRANVARO) {
this.franvaroOrsaker$ = this.deltagareAvvikelseService.getOrsaksKoderFranvaro$();
this.andraKandaOrsaker$ = this.deltagareAvvikelseService.getAndraKandaOrsaker$();
}
if ((this.alternativeFormControl.value as string) == Alternative.AVVIKELSE) {
if ((this.alternativeFormControl.value as string) == ReportType.AVVIKELSE) {
this.avvikelseOrsaker$ = this.deltagareAvvikelseService.getOrsaksKoderAvvikelse$();
this.fragor1$ = this.deltagareAvvikelseService.getFragorForAvvikelser$().pipe(
map((fragor: FragorForAvvikelser[]) => {
@@ -277,7 +277,7 @@ export class DeltagareAvvikelseComponent implements OnInit {
setOrsakerChanged(): void {
this.avvikelseFormGroup.markAsUntouched();
if ((this.alternativeFormControl.value as string) === Alternative.AVVIKELSE) {
if ((this.alternativeFormControl.value as string) === ReportType.AVVIKELSE) {
this.selectedOrsaksKod = this.avvikelseFormGroup.get('orsakerFormGroup').get('orsaker').value as string;
}

6
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelse/report-alternatives.ts
View File

@@ -1,15 +1,15 @@
import { Alternative } from '@msfa-enums/alternative.enum';
import { ReportType } from '@msfa-enums/report-type.enum';
import { DayOrPartOfDay } from '@msfa-enums/day-or-part-of-day.enum';
import { RadiobuttonModel } from '@af/digi-ng/_form/form-radiobutton-group';
export const avvikelseAlternatives: RadiobuttonModel[] = [
{
label: 'Frånvaro',
value: Alternative.FRANVARO,
value: ReportType.FRANVARO,
},
{
label: 'Avvikelse',
value: Alternative.AVVIKELSE,
value: ReportType.AVVIKELSE,
},
];