diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.html index e1e6f44..b2d6bc3 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.html +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.html @@ -24,19 +24,16 @@ - + [uiRequired]="true" + [uiInvalid]="emailsControl.invalid && emailsControl.dirty" + [uiValidationMessage]="emailsControl.errors?.required || emailsControl.errors?.invalid || 'Ogiltig e-postadress'" + > - + [uiLabel]="questions[i]?.name" + [uiRequired]="questionIsRequired(questions[i])" + [uiValidationMessage]="question.errors?.required || question.errors?.invalid" + [uiAnnounceIfOptional]="true" + [uiMaxLength]="2000" + [uiInvalid]="formControlIsInvalid(question)" + > diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts index dec5704..fa6e1e2 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts @@ -3,7 +3,6 @@ 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 { DigiNgFormTextareaModule } from '@af/digi-ng/_form/form-textarea'; import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; @@ -14,6 +13,7 @@ import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/conf import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; +import { UiTextareaModule } from '@ui/textarea/textarea.module'; import { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { AvvikelseReportFormComponent } from './avvikelse-report-form.component'; @@ -29,7 +29,6 @@ import { AvvikelseReportFormService } from './avvikelse-report-form.service'; ReactiveFormsModule, DigiNgFormRadiobuttonGroupModule, DigiNgFormDatepickerModule, - DigiNgFormTextareaModule, DigiNgProgressProgressbarModule, ReportLayoutModule, ConfirmDialogModule, @@ -40,6 +39,7 @@ import { AvvikelseReportFormService } from './avvikelse-report-form.service'; ReportDescriptionListModule, DigiNgFormInputModule, DigiNgDialogModule, + UiTextareaModule, ], providers: [AvvikelseReportFormService], exports: [AvvikelseReportFormComponent], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.html index ae8f211..36c15fb 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.html @@ -87,24 +87,15 @@
- -
- -
+ uiLabel="Beskriv frånvaro" + [uiInvalid]="formControlIsInvalid(['knownReasonComment'])" + [uiValidationMessage]="formErrors?.knownReasonComment" + [uiMaxLength]="2000" + [uiRequired]="true" + [uiAnnounceIfOptional]="true" + >
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 ce746fb..1ccd187 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 @@ -3,7 +3,6 @@ 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 { DigiNgFormTextareaModule } from '@af/digi-ng/_form/form-textarea'; import { DigiNgFormValidationMessageModule } from '@af/digi-ng/_form/form-validation-message'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; @@ -13,6 +12,7 @@ import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.modu import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; +import { UiTextareaModule } from '@ui/textarea/textarea.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'; @@ -34,10 +34,10 @@ import { FranvaroReportFormService } from './franvaro-report-form.service'; DigiNgFormDatepickerModule, DigiNgFormRadiobuttonGroupModule, UiSkeletonModule, - DigiNgFormTextareaModule, DigiNgFormInputModule, DigiNgFormValidationMessageModule, DigiNgDialogModule, + UiTextareaModule, ], providers: [FranvaroReportFormService], exports: [FranvaroReportFormComponent], 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 c4ede7e..de70728 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 @@ -61,17 +61,16 @@ >
- + uiLabel="Kompletterande information" + uiDescription="Undvik att skriva in information som känsliga personuppgifter, skyddad identitet eller deltagarens mående. Skriv i sådant fall in det telefonnummer du vill bli kontaktad på, vi bedömer om återkoppling är relevant." + [uiRequired]="true" + [uiInvalid]="formControlIsInvalid('comment')" + [uiValidationMessage]="commentFormControl.errors?.required" + [uiAnnounceIfOptional]="true" + [uiMaxLength]="2000" + >