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

Typo fixes for required fields

Browse Source
This commit is contained in:
Erik Tiekstra
2021-10-11 09:46:54 +02:00
parent 3d5d31ce9e
commit 631418bc09
7 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/mina-sidor-fa/src/app/shared/components/handledare-picker-form/handledare-picker-form.component.ts
View File

@@ -30,7 +30,7 @@ export class HandledarePickerFormComponent implements OnChanges {
@Input() invalid = false;
@Output() selectedHandledareChanged = new EventEmitter<string>();
formGroup: FormGroup = new FormGroup({
handledare: new FormControl(null, [RequiredValidator('Handledare')]),
handledare: new FormControl(null, [RequiredValidator('Handledare är obligatorisk')]),
});
selectableHandledare: FormSelectItem[] = [];
submitted = false;

2
apps/mina-sidor-fa/src/app/shared/components/organization-picker-form/organization-picker-form.component.ts
View File

@@ -27,7 +27,7 @@ export class OrganizationPickerFormComponent implements OnChanges {
@Output() selectedOrganizationChanged = new EventEmitter<Organization>();
organizationPickerFormGroup: FormGroup = new FormGroup({
organization: new FormControl(null, [RequiredValidator('Organisation')]),
organization: new FormControl(null, [RequiredValidator('Organisation är obligatorisk')]),
});
selectableOrganizations: Array<FormSelectItem> = [];

10
apps/mina-sidor-fa/src/app/shared/utils/validators/required.validator.ts
View File

@@ -1,15 +1,11 @@
import { AbstractControl, ValidatorFn } from '@angular/forms';
import { ValidationError } from '@msfa-models/validation-error.model';
export function RequiredValidator(label = 'Fältet', arrayValue = false): ValidatorFn {
export function RequiredValidator(message = 'Fältet är obligatoriskt'): ValidatorFn {
return (control: AbstractControl): ValidationError => {
if (control) {
if ((arrayValue && !control.value) || (Array.isArray(control.value) && !control.value.length)) {
return { type: 'required', message: `Minst ${label} behöver väljas` };
}
if (!control.value) {
return { type: 'required', message: `${label} är obligatoriskt` };
if (!control.value || (Array.isArray(control.value) && !control.value.length)) {
return { type: 'required', message };
}
}