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
apps/mina-sidor-fa/src/app/shared/utils/uuid.ts → apps/mina-sidor-fa/src/app/shared/utils/uuid.util.ts
View File
apps/mina-sidor-fa/src/app/shared/utils/validators/avvikelse-form-validator.ts
+21 -20
View File
@@ -1,12 +1,12 @@
import { AbstractControl, ValidatorFn } from '@angular/forms';
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 { FranvaroOrsaksKodEnum } from '@msfa-enums/franvaro-orsak-kod.enum';
import { KandaOrsakerEnum } from '@msfa-enums/kanda-orsaker-kod.enum';
import { ValidationError } from '@msfa-models/validation-error.model';
export interface Controls {
[key: string]: AbstractControl
[key: string]: AbstractControl;
}
export function requiredDescriptionValidator(): ValidatorFn {
@@ -19,12 +19,12 @@ export function requiredDescriptionValidator(): ValidatorFn {
const isRequired = !valueOfFormControl && +valueOfNestedFormControl === KandaOrsakerEnum.AnnanOrsak;
if (isRequired) {
return { type: 'required', message: 'Beskrivning är obligatoriskt' }
return { type: 'required', message: 'Beskrivning är obligatoriskt' };
}
return null;
}
}
};
}
export function requiredOrsakerValidator(): ValidatorFn {
@@ -41,7 +41,7 @@ export function requiredOrsakerValidator(): ValidatorFn {
return null;
}
}
};
}
export function requiredAnnanKandOrsakValidator(): ValidatorFn {
@@ -59,7 +59,7 @@ export function requiredAnnanKandOrsakValidator(): ValidatorFn {
return null;
}
}
};
}
export class RequiredDateValidator {
@@ -69,7 +69,7 @@ export class RequiredDateValidator {
const isRequired = !valueOfFormControl;
return isRequired ? { dateIsRequired: 'Datum är obligatoriskt' } : null;
}
};
}
}
@@ -78,7 +78,7 @@ export function requiredDayOrPartOfDayValidator(): ValidatorFn {
const ctrls = control?.parent?.controls as Controls;
if (ctrls) {
const isFranvaro = ctrls['alternative'].value === Alternative.FRANVARO;
const isFranvaro = ctrls['alternative'].value === ReportType.FRANVARO;
const valueOfFormControl = control.value as string;
const isRequired = isFranvaro && !valueOfFormControl;
@@ -88,7 +88,7 @@ export function requiredDayOrPartOfDayValidator(): ValidatorFn {
return null;
}
}
};
}
export function requiredStartTimeValidator(): ValidatorFn {
@@ -96,7 +96,7 @@ export function requiredStartTimeValidator(): ValidatorFn {
const ctrls = control?.parent?.parent?.controls as Controls;
if (ctrls) {
const isFranvaro = ctrls['alternative']?.value as string === Alternative.FRANVARO;
const isFranvaro = (ctrls['alternative']?.value as string) === ReportType.FRANVARO;
const isPartOfDay = ctrls['dayOrPartOfDay']?.value === DayOrPartOfDay.DEL_AV_DAG;
const valueOfFormControl = control?.value as string;
const isRequired = isFranvaro && isPartOfDay && (valueOfFormControl === '' || valueOfFormControl === null);
@@ -107,7 +107,7 @@ export function requiredStartTimeValidator(): ValidatorFn {
return null;
}
}
};
}
export function requiredEndTimeValidator(): ValidatorFn {
@@ -115,7 +115,7 @@ export function requiredEndTimeValidator(): ValidatorFn {
const ctrls = control?.parent?.parent?.controls as Controls;
if (ctrls) {
const isFranvaro = ctrls['alternative']?.value as string === Alternative.FRANVARO;
const isFranvaro = (ctrls['alternative']?.value as string) === ReportType.FRANVARO;
const isPartOfDay = ctrls['dayOrPartOfDay']?.value === DayOrPartOfDay.DEL_AV_DAG;
const valueOfFormControl = control?.value as string;
const isRequired = isFranvaro && isPartOfDay && (valueOfFormControl === '' || valueOfFormControl === null);
@@ -126,7 +126,7 @@ export function requiredEndTimeValidator(): ValidatorFn {
return null;
}
}
};
}
export function requiredFraga1Validator(): ValidatorFn {
@@ -144,7 +144,7 @@ export function requiredFraga1Validator(): ValidatorFn {
return null;
}
}
};
}
export function requiredfraga2Validator(): ValidatorFn {
@@ -155,11 +155,12 @@ export function requiredfraga2Validator(): ValidatorFn {
const isAvvikelse = ctrls['alternative']?.value === 'avvikelse';
const valueOfFormControl = control.value as string;
const orsaksKodToValidate = ctrls['orsakerFormGroup']?.get('orsaker')?.value as string;
const isRequired = isAvvikelse && !valueOfFormControl &&
(orsaksKodToValidate !== '19' &&
orsaksKodToValidate !== '20' &&
orsaksKodToValidate !== '28'
)
const isRequired =
isAvvikelse &&
!valueOfFormControl &&
orsaksKodToValidate !== '19' &&
orsaksKodToValidate !== '20' &&
orsaksKodToValidate !== '28';
if (isRequired) {
return { type: 'required', message: `Beskrivning är obligatoriskt` };
@@ -167,5 +168,5 @@ export function requiredfraga2Validator(): ValidatorFn {
return null;
}
}
};
}