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

Fixed validation for frånvaro-report

Browse Source
This commit is contained in:
Erik Tiekstra
2021-10-11 15:06:03 +02:00
parent 7c37fae163
commit c37b9cb8b9
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.validator.ts
View File

@@ -1,5 +1,6 @@
import { AbstractControl, ValidatorFn } from '@angular/forms'; import { AbstractControl, ValidatorFn } from '@angular/forms';
import { ANNAN_KAND_ORSAK_ID, ANNAN_ORSAK_ID } from '@msfa-constants/franvaro-reasons'; import { ANNAN_KAND_ORSAK_ID, ANNAN_ORSAK_ID } from '@msfa-constants/franvaro-reasons';
import { CHARACTER_REGEX } from '@msfa-constants/regex';
import { Franvaro } from '@msfa-models/franvaro.model'; import { Franvaro } from '@msfa-models/franvaro.model';
const TIME_REGEX = /^([0-1]?[0-9]|2[0-4]):([0-5][0-9])(:[0-5][0-9])?$/; const TIME_REGEX = /^([0-1]?[0-9]|2[0-4]):([0-5][0-9])(:[0-5][0-9])?$/;
@@ -36,11 +37,18 @@ export class FranvaroReportValidator {
...errors, ...errors,
otherKnownReason: 'Känd orsak måste väljas', otherKnownReason: 'Känd orsak måste väljas',
}; };
} else if (otherKnownReason === ANNAN_ORSAK_ID && !knownReasonComment) { } else if (otherKnownReason === ANNAN_ORSAK_ID) {
if (!knownReasonComment) {
errors = { errors = {
...errors, ...errors,
knownReasonComment: 'Beskrivning av frånvaro är obligatorisk', knownReasonComment: 'Beskrivning av frånvaro är obligatorisk',
}; };
} else if (!CHARACTER_REGEX.test(knownReasonComment)) {
errors = {
...errors,
knownReasonComment: 'Beskrivning av frånvaro har en ogiltig värde',
};
}
} }
} }
if (!date) { if (!date) {