From f166c530d992fcac6f7932d3507b738aaf225867 Mon Sep 17 00:00:00 2001 From: Daniel Appelgren Date: Fri, 19 Nov 2021 11:57:10 +0100 Subject: [PATCH] =?UTF-8?q?feature(digi-ng-migrering):=20Valideringsmeddel?= =?UTF-8?q?anden=20=C3=A4r=20nu=20flyttat=20fr=C3=A5n=20digi=20till=20v?= =?UTF-8?q?=C3=A5r=20kod=20(TV-861)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge in TEA/mina-sidor-fa-web from feature/TV-861-digi-ng-form-validation-message to develop Squashed commit of the following: commit 0f499871aca875dfcca640e8fbf871f52adc33d3 Author: Daniel Appelgren Date: Fri Nov 19 11:54:42 2021 +0100 fix minor bugs commit ba3d2784903127e1b9dacbd04ad523a846cfe3f4 Merge: 20a004ba 981fb51d Author: Daniel Appelgren Date: Fri Nov 19 11:51:17 2021 +0100 Merge branch 'develop' into feature/TV-861-digi-ng-form-validation-message # Conflicts: # apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts # apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts # apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts # apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.module.ts commit 20a004ba2f75f92043713704305815d60c61e2ef Author: Erik Tiekstra Date: Thu Nov 18 15:54:16 2021 +0100 Removed unused messagetypes from validation messages commit 7dd5317267560dfdc95390b32f61b3df1518eb40 Merge: 9ffdefae c6bbfb1b Author: Erik Tiekstra Date: Thu Nov 18 15:48:34 2021 +0100 Fixed some issues with a11y commit 9ffdefaea78c90f9d4f0ee3f9b4bf5a157c34667 Author: WP\holno Date: Wed Nov 17 16:47:47 2021 +0100 removed reference to digiNgFormSelect commit 6c54a0ea9b0f3101adf60c6d04c7ac92010206c9 Author: WP\holno Date: Wed Nov 17 16:45:29 2021 +0100 Replaced digi-ng-form-sleect with ui-select (handledare-picker and organization-picker-form left. commit 58341f57612bd70204bbdf3f9805bb54f8fc2078 Author: WP\holno Date: Wed Nov 17 15:56:42 2021 +0100 removed reference in employee-form for digiNgFormSelect commit 663743508264cb781c3cb60682f6e6937a8e4eeb Author: WP\holno Date: Wed Nov 17 15:50:29 2021 +0100 Replaced digi-ng-form-select with ui-select for edit-employee-form commit fea6215809128f78229cbded5f92fc5de461317e Author: WP\holno Date: Wed Nov 17 14:33:58 2021 +0100 - Replaced all references to digi-form-validation-message (digi-core) to our new ui-validation-message ( a few left to change in this feature). - Replaced references from digi-ng-form-select to our new ui-select in franvaro-report and signal-form commit 28c152efe90acf766dbd190b12fd262344e39010 Author: WP\holno Date: Wed Nov 17 10:14:50 2021 +0100 Removed blank space commit 42fa243d15bba562cd019d542e9815350623db63 Merge: a7a4a4c1 8f05343e Author: WP\holno Date: Wed Nov 17 10:10:44 2021 +0100 Merge branch 'develop' into feature/TV-861-digi-ng-form-validation-message commit a7a4a4c111bc7a7cd3704d7c2866fcbb31ef00e0 Author: WP\holno Date: Wed Nov 17 10:10:32 2021 +0100 - Created ui-validation-message component for digi-form-validation-message to replace digi-ng´s form-validation. - Removed css style as it did not work earlier and looks the same without (good margin top as it is). FYI: the new validation-message from digi-core includes three types (success, error, warning), digi-ng´s included only two types (success, error). --- .../edit-employee-form.component.html | 41 +++---- .../employee-form/employee-form.module.ts | 8 +- .../avvikelse-report-form.component.html | 20 ++- .../avvikelse-report-form.module.ts | 2 + .../franvaro-report-form.component.html | 114 ++++++------------ .../franvaro-report-form.component.scss | 6 +- .../franvaro-report-form.module.ts | 8 +- .../gemensam-planering-form.component.html | 7 +- .../gemensam-planering-form.module.ts | 2 + .../informativ-rapport-form.component.html | 22 ++-- .../informativ-rapport-form.component.scss | 10 -- .../informativ-rapport-form.module.ts | 4 +- .../periodisk-redovisning-form.component.html | 44 +++---- .../periodisk-redovisning-form.module.ts | 6 +- .../signal-form/signal-form.component.html | 12 +- .../signal-form/signal-form.component.scss | 4 - .../signal-form/signal-form.component.ts | 4 +- .../signal-form/signal-form.module.ts | 6 +- ...form-step0-still-unemployed.component.html | 11 +- .../deltagare-export.component.html | 9 +- .../handledare-picker-form.component.html | 25 ++-- .../handledare-picker-form.module.ts | 3 +- .../organization-picker-form.component.html | 10 +- .../organization-picker-form.module.ts | 3 +- .../tree-nodes-selector.component.html | 5 +- libs/ui/src/checkbox/checkbox.component.html | 9 +- libs/ui/src/checkbox/checkbox.module.ts | 3 +- libs/ui/src/input/input.component.html | 9 +- libs/ui/src/input/input.module.ts | 3 +- .../radiobutton-group.component.html | 9 +- .../radiobutton-group.component.ts | 2 +- .../radiobutton-group.module.ts | 3 +- libs/ui/src/select/select.component.html | 9 +- libs/ui/src/select/select.module.ts | 3 +- libs/ui/src/textarea/textarea.component.html | 9 +- libs/ui/src/textarea/textarea.module.ts | 3 +- .../validation-message-type.enum.ts | 5 + .../validation-message.component.html | 5 + .../validation-message.component.scss | 0 .../validation-message.component.spec.ts | 25 ++++ .../validation-message.component.ts | 14 +++ .../validation-message.module.ts | 11 ++ 42 files changed, 244 insertions(+), 264 deletions(-) create mode 100644 libs/ui/src/validation-message/validation-message-type.enum.ts create mode 100644 libs/ui/src/validation-message/validation-message.component.html create mode 100644 libs/ui/src/validation-message/validation-message.component.scss create mode 100644 libs/ui/src/validation-message/validation-message.component.spec.ts create mode 100644 libs/ui/src/validation-message/validation-message.component.ts create mode 100644 libs/ui/src/validation-message/validation-message.module.ts diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html index c3f4769..12e62a5 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html @@ -18,14 +18,10 @@ [afDisableValidStyle]="true" [afInvalid]="editEmployeeFormGroup.errors?.email && emailFormControl.touched" > -
- {{editEmployeeFormGroup.errors.email}} -
- +

Behörigheter

@@ -34,27 +30,18 @@

Tjänster

Välj de tjänster du vill ge personalen tillgång till.

- - + -
- - {{editEmployeeFormGroup.errors.tjanster}} - -
+ [uiId]="tjansterElementId" + uiLabel="Välj tjänster" + uiPlaceholder="Välj tjänst" + [uiInvalid]="editEmployeeFormGroup.errors?.tjanster && tjansterFormControl.touched" + [uiOptions]="selectableTjansterFormItems" + (uiOnChange)="toggleTjanst()" + [uiValidationMessage]="editEmployeeFormGroup.errors?.tjanster" + >
-

Utförande verksamheter och adresser

Välj de utförandeverksamheter och utförande adresser du vill ge personalen behörighet till.

diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts index 85b4000..1b7090e 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts @@ -4,9 +4,8 @@ import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox'; import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker'; import { DigiNgFormInputModule } from '@af/digi-ng/_form/form-input'; import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group'; -import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select'; -import { DigiNgLoaderSpinnerModule } from '@af/digi-ng/_loader/loader-spinner'; import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover'; +import { DigiNgLoaderSpinnerModule } from '@af/digi-ng/_loader/loader-spinner'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -22,6 +21,8 @@ import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { EmployeeDeleteModule } from '../../components/employee-delete/employee-delete.module'; import { EditEmployeeFormComponent } from './edit-employee-form/edit-employee-form.component'; import { EmployeeFormComponent } from './employee-form.component'; +import { UiSelectModule } from '@ui/select/select.module'; +import { UiValidationMessageModule } from '@ui/validation-message/validation-message.module'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], @@ -34,12 +35,13 @@ import { EmployeeFormComponent } from './employee-form.component'; DigiNgFormInputModule, DigiNgFormRadiobuttonGroupModule, DigiNgFormDatepickerModule, - DigiNgFormSelectModule, DigiNgPopoverModule, DigiNgFormCheckboxModule, DigiNgButtonModule, DigiNgLoaderSpinnerModule, UiSkeletonModule, + UiSelectModule, + UiValidationMessageModule, LayoutModule, EmployeeDeleteModule, DigiNgDialogModule, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html index 4f627af..0fbd824 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html @@ -35,20 +35,18 @@
- + uiLabel="Orsak till avvikelse" + uiPlaceholder="Välj orsak till avvikelse" + [uiAnnounceIfOptional]="true" + [uiRequired]="true" + [uiInvalid]="formControlIsInvalid(reasonFormControl)" + [uiOptions]="reason" + [uiValidationMessage]="reasonFormControl.errors?.required" + >
-
- -
- -
+ uiLabel="Orsak till frånvaro" + uiPlaceholder="Välj orsak till frånvaro" + [uiAnnounceIfOptional]="true" + [uiRequired]="true" + [uiInvalid]="formControlIsInvalid(['reason'])" + [uiOptions]="reasons" + [uiValidationMessage]="formErrors.reason" + >
@@ -81,14 +73,10 @@ afLabel="Dag för frånvaro" [formControl]="dateFormControl" > -
- -
+
@@ -108,7 +96,7 @@
- +
-
- -
+
-
- -
+
-
- -
- + +

Tiden deltagaren skulle varit närvarande

@@ -172,14 +148,10 @@ [afInvalid]="formControlIsInvalid(['expectedPresenceStartTime', 'expectedPresenceEndTimeIsBeforeStartTime'])" afType="time" > -
- -
+
-
- -
+
-
- -
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.scss index f4ecea2..e4af984 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.scss @@ -24,7 +24,7 @@ } &__time-picker { - flex-grow: 1; + width: 100%; } &__footer { @@ -37,8 +37,4 @@ display: flex; gap: var(--digi--layout--gutter); } - - &__validation-message { - margin-top: var(--digi--layout--gutter--s); - } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.module.ts index 117cc3b..e31c763 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.module.ts @@ -1,8 +1,6 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker'; import { DigiNgFormInputModule } from '@af/digi-ng/_form/form-input'; -import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select'; -import { DigiNgFormValidationMessageModule } from '@af/digi-ng/_form/form-validation-message'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -14,6 +12,8 @@ import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiRadiobuttonGroupModule } from '@ui/radiobutton-group/radiobutton-group.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { UiTextareaModule } from '@ui/textarea/textarea.module'; +import { UiSelectModule } from '@ui/select/select.module'; +import { UiValidationMessageModule } from '@ui/validation-message/validation-message.module'; import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { FranvaroReportFormComponent } from './franvaro-report-form.component'; @@ -31,13 +31,13 @@ import { FranvaroReportFormService } from './franvaro-report-form.service'; UiLoaderModule, UiBackLinkModule, ReportDescriptionListModule, - DigiNgFormSelectModule, DigiNgFormDatepickerModule, UiSkeletonModule, + UiValidationMessageModule, DigiNgFormInputModule, - DigiNgFormValidationMessageModule, DigiNgDialogModule, UiTextareaModule, + UiSelectModule, UiRadiobuttonGroupModule, UiLinkButtonModule, ], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.html index 5d6a9e7..aecf1f3 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.html @@ -73,9 +73,10 @@ > - {{gpFormGroup.errors.activityIds}} + diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts index aace261..372c0d9 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.module.ts @@ -11,6 +11,7 @@ import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiRadiobuttonGroupModule } from '@ui/radiobutton-group/radiobutton-group.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; +import { UiValidationMessageModule } from '@ui/validation-message/validation-message.module'; import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { GemensamPlaneringFormComponent } from './gemensam-planering-form.component'; @@ -33,6 +34,7 @@ import { GemensamPlaneringFormService } from './gemensam-planering-form.service' UiSkeletonModule, DigiNgFormCheckboxModule, DigiNgDialogModule, + UiValidationMessageModule, UiLinkButtonModule, ], providers: [GemensamPlaneringFormService], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html index db945c3..9fcd9ae 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html @@ -46,19 +46,17 @@ om kategorierna
- + uiLabel="" + uiPlaceholder="Välj kategori" + uiId="informativ-rapport-form-category" + [uiAnnounceIfOptional]="true" + [uiRequired]="true" + [uiInvalid]="formControlIsInvalid('category')" + [uiOptions]="categorySelectItems" + [uiValidationMessage]="categoryFormControl.errors?.required" + >
- - + [uiInvalid]="formControlIsInvalid(periodFormControl)" + (uiOnChange)="openChangePeriodDialogIfValuesExist()" + >
-
- - {{formErrors?.activitiesMismatch}} - -
+
@@ -151,14 +145,10 @@ [afInvalid]="activityLocationIsInvalid(activityFormGroup)" afLabel="Utfört på plats" > -
- - {{activityFormGroup.errors.locationCheckboxes}} - -
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts index 762db0b..8a0a1a9 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.module.ts @@ -1,6 +1,5 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog'; import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox'; -import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -11,7 +10,9 @@ import { UiInputModule } from '@ui/input/input.module'; import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiRadiobuttonGroupModule } from '@ui/radiobutton-group/radiobutton-group.module'; +import { UiSelectModule } from '@ui/select/select.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; +import { UiValidationMessageModule } from '@ui/validation-message/validation-message.module'; import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { PeriodiskRedovisningFormComponent } from './periodisk-redovisning-form.component'; @@ -29,13 +30,14 @@ import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.se ReportDescriptionListModule, UiBackLinkModule, UiLoaderModule, + UiSelectModule, UiSkeletonModule, DigiNgDialogModule, - DigiNgFormSelectModule, DigiNgFormCheckboxModule, UiRadiobuttonGroupModule, UiLinkButtonModule, UiInputModule, + UiValidationMessageModule, ], providers: [PeriodiskRedovisningFormService], exports: [PeriodiskRedovisningFormComponent], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.html index d254e9b..ab47e98 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.html @@ -67,14 +67,10 @@ [afMinDate]="avrop.startDate" [afMaxDate]="getMaxDate(avrop.startDate)" > -
- -
+