diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html index 3872ebe..295b1c4 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html @@ -14,10 +14,9 @@
- - Redigera - behörigheter för {{employee.fullName}} - + Redigera  behörigheter för {{employee.fullName}}

Personalkonto

Här ser du personalkontot. Ändra behörighet genom att klicka på redigera.

@@ -49,14 +48,16 @@

Tjänst

-
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss index 6b0245d..843d619 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss @@ -1,7 +1,6 @@ @import 'functions/rem'; @import 'variables/gutters'; @import 'variables/colors'; -@import 'mixins/buttons'; @import 'mixins/list'; .employee-card { @@ -56,10 +55,6 @@ } } - &__edit-button { - @include msfa__button('secondary'); - } - &__authorization-icon { margin-right: var(--digi--layout--gutter--s); diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.module.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.module.ts index a21af54..316bcfc 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.module.ts @@ -1,13 +1,14 @@ import { DigiNgLayoutExpansionPanelModule } from '@af/digi-ng/_layout/layout-expansion-panel'; -import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { RolesDialogModule } from '@msfa-shared/components/roles-dialog/roles-dialog.module'; import { LocalDatePipeModule } from '@msfa-shared/pipes/local-date/local-date.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; +import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; +import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { EmployeeCardComponent } from './employee-card.component'; @NgModule({ @@ -21,7 +22,8 @@ import { EmployeeCardComponent } from './employee-card.component'; DigiNgLayoutExpansionPanelModule, LocalDatePipeModule, HideTextModule, - BackLinkModule, + UiBackLinkModule, + UiLinkButtonModule, RolesDialogModule, ], }) 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 ecd905e..c3f4769 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 @@ -134,13 +134,9 @@ diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss index 4701337..e24f62c 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss @@ -51,10 +51,6 @@ gap: var(--digi--layout--gutter); } - &__link-btn { - @include msfa__button('secondary'); - } - &__choose-all-utforande-verksamheter { display: block; margin: 1.5rem 0; 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 cc3b313..85b4000 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 @@ -5,22 +5,23 @@ 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 { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover'; import { DigiNgLoaderSpinnerModule } from '@af/digi-ng/_loader/loader-spinner'; +import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; +import { ErrorListModule } from '@msfa-shared/components/error-list/error-list.module'; import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { RolesDialogModule } from '@msfa-shared/components/roles-dialog/roles-dialog.module'; import { TreeNodesSelectorModule } from '@msfa-shared/components/tree-nodes-selector/tree-nodes-selector.module'; import { LocalDatePipeModule } from '@msfa-shared/pipes/local-date/local-date.module'; +import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; +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 { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; -import { ErrorListModule } from '@msfa-shared/components/error-list/error-list.module'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], @@ -46,6 +47,7 @@ import { ErrorListModule } from '@msfa-shared/components/error-list/error-list.m TreeNodesSelectorModule, ErrorListModule, RolesDialogModule, + UiLinkButtonModule, ], }) export class EmployeeFormModule {} 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 b2d6bc3..eeb379d 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 @@ -74,8 +74,10 @@ diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.scss b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.scss index 60c5574..324b8f2 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.scss @@ -24,7 +24,7 @@ &__footer { margin-top: $digi--layout--gutter--xl; display: flex; - justify-content: space-between; + gap: $digi--layout--gutter; align-items: center; } } diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.module.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.module.ts index 606f234..fd9b6dc 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiTextareaModule } from '@ui/textarea/textarea.module'; import { EmployeeInviteComponent } from './employee-invite.component'; @@ -15,10 +15,10 @@ import { EmployeeInviteComponent } from './employee-invite.component'; CommonModule, RouterModule.forChild([{ path: '', component: EmployeeInviteComponent }]), LayoutModule, - BackLinkModule, ReactiveFormsModule, UiTextareaModule, UiLoaderModule, + UiLinkButtonModule, ], }) export class EmployeeInviteModule {} diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html index 3801cb9..7040087 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html @@ -10,10 +10,9 @@

- + Skapa personalkonto
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.ts index a5614ff..82ddace 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.ts @@ -5,6 +5,7 @@ import { Employee, EmployeesData } from '@msfa-models/employee.model'; import { Sort } from '@msfa-models/sort.model'; import { EmployeeService } from '@msfa-services/api/employee.service'; import { BehaviorSubject, Observable } from 'rxjs'; +import { UiLinkButtonType } from '@ui/link-button/link-button-type.enum'; @Component({ selector: 'msfa-employees', @@ -13,6 +14,7 @@ import { BehaviorSubject, Observable } from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class EmployeesComponent implements OnDestroy { + UiLinkButtonType = UiLinkButtonType; private _searchValue$ = new BehaviorSubject(''); onlyEmployeesWithoutAuthorization$: Observable = this.employeeService.onlyEmployeesWithoutAuthorization$; employeesData$: Observable = this.employeeService.employeesData$; diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.module.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.module.ts index fe7af2c..4f724a5 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.module.ts @@ -1,9 +1,9 @@ -import { DigiNgLinkButtonModule } from '@af/digi-ng/_link/link-button'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiLinkButtonModule } from '@ui/link-button/link-button.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { EmployeeDeleteModule } from '../../components/employee-delete/employee-delete.module'; import { EmployeesListModule } from './components/employees-list/employees-list.module'; @@ -19,8 +19,8 @@ import { EmployeesComponent } from './employees.component'; UiSkeletonModule, EmployeesListModule, EmployeeDeleteModule, - DigiNgLinkButtonModule, FormsModule, + UiLinkButtonModule, ], }) export class EmployeesModule {} diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html index 71c9b67..834b5c6 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html @@ -4,53 +4,39 @@
  • - + + Gemensam planering +
  • - + + Avvikelserapport (frånvaro) +
  • - + + Avvikelserapport (avvikelse) +
  • - + + Periodisk redovisning +
  • - + + Signal om arbete eller studier +
  • - + + Informativ rapport +
  • - + + Slutredovisning +
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.scss index 8f8eaf0..a13f4b3 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.scss @@ -18,10 +18,4 @@ gap: var(--digi--layout--gutter); margin-bottom: $digi--layout--gutter--xxl; } - - &__button { - ::ng-deep .digi-ng-link-button { - padding: var(--digi--layout--padding--10) var(--digi--layout--padding--30) !important; - } - } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts index c0bdcb7..c61f92e 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts @@ -7,6 +7,7 @@ import { ReportsData } from '@msfa-models/report.model'; import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; +import { UiLinkButtonType } from '@ui/link-button/link-button-type.enum'; @Component({ selector: 'msfa-deltagare-tab-reports', @@ -15,6 +16,8 @@ import { map, shareReplay, switchMap } from 'rxjs/operators'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class DeltagareTabReportsComponent { + UiLinkButtonType = UiLinkButtonType; + genomforandereferens$: Observable = this.activatedRoute.params.pipe( map(({ genomforandeReferens }) => +genomforandeReferens) ); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html index 594b055..c2f4f0a 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html @@ -3,7 +3,7 @@
- Tillbaka till deltagarlistan + Tillbaka till deltagarlistan

{{contactInformation.fullName }}

{{notAllowedToReportWarning(avrop)}}

- Tillbaka till deltagaren + Tillbaka till deltagaren
@@ -29,7 +29,7 @@
{{submittedDate | date:'longDate'}} kl {{submittedDate | date:'shortTime'}}
- Tillbaka till deltagaren + Tillbaka till deltagaren
@@ -86,10 +86,10 @@
Förhandsgranska - - Avbryt + + Avbryt  och gå tillbaka till deltagaren - +
{{notAllowedToReportWarning(avrop)}}

- Tillbaka till deltagaren + Tillbaka till deltagaren @@ -28,7 +28,7 @@ - Tillbaka till deltagaren + Tillbaka till deltagaren
Förhandsgranska - - Avbryt + + Avbryt  och gå tillbaka till deltagaren - +
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 ba3a146..117cc3b 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 @@ -7,8 +7,9 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.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 { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; @@ -28,7 +29,7 @@ import { FranvaroReportFormService } from './franvaro-report-form.service'; LayoutModule, ReportLayoutModule, UiLoaderModule, - BackLinkModule, + UiBackLinkModule, ReportDescriptionListModule, DigiNgFormSelectModule, DigiNgFormDatepickerModule, @@ -38,6 +39,7 @@ import { FranvaroReportFormService } from './franvaro-report-form.service'; DigiNgDialogModule, UiTextareaModule, UiRadiobuttonGroupModule, + UiLinkButtonModule, ], providers: [FranvaroReportFormService], exports: [FranvaroReportFormComponent], 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 0446fb9..5d6a9e7 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 @@ -10,7 +10,7 @@

{{notAllowedToReportWarning(avrop)}}

- Tillbaka till deltagaren + Tillbaka till deltagaren
{{lastSubmittedGP | date:'longDate'}} kl {{lastSubmittedGP | date:'shortTime'}} - Tillbaka till deltagaren + Tillbaka till deltagaren
Förhandsgranska - - Avbryt + + Avbryt  och gå tillbaka till deltagaren - +
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 d03b761..aace261 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 @@ -5,8 +5,9 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.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 { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; @@ -26,12 +27,13 @@ import { GemensamPlaneringFormService } from './gemensam-planering-form.service' UiRadiobuttonGroupModule, ReactiveFormsModule, ReportLayoutModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, ReportDescriptionListModule, UiSkeletonModule, DigiNgFormCheckboxModule, DigiNgDialogModule, + UiLinkButtonModule, ], providers: [GemensamPlaneringFormService], exports: [GemensamPlaneringFormComponent], 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 de70728..db945c3 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 @@ -19,7 +19,7 @@ - Tillbaka till deltagaren + Tillbaka till deltagaren @@ -76,10 +76,10 @@
Förhandsgranska - - Avbryt + + Avbryt  och gå tillbaka till deltagaren - +
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts index f0403ab..e4ea7cb 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts @@ -4,9 +4,10 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; +import { UiLinkButtonModule } from '@ui/link-button/link-button.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'; @@ -25,11 +26,12 @@ import { InformativRapportFormService } from './informativ-rapport-form.service' ReportLayoutModule, ConfirmDialogModule, ReportDescriptionListModule, - BackLinkModule, + UiBackLinkModule, UiSkeletonModule, DigiNgDialogModule, DigiNgFormSelectModule, UiTextareaModule, + UiLinkButtonModule, ], providers: [InformativRapportFormService], exports: [InformativRapportFormComponent], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html index cc46089..217fae6 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.html @@ -21,7 +21,7 @@
{{submittedDate | date:'longDate'}} kl {{submittedDate | date:'shortTime'}}
- Tillbaka till deltagaren + Tillbaka till deltagaren @@ -170,10 +170,10 @@
Förhandsgranska - - Avbryt + + Avbryt  och gå tillbaka till deltagaren - +
@@ -257,7 +257,7 @@

En Gemensam planering måste ha mottagits för att en Periodisk redovisning ska kunna skapas.

- Tillbaka till deltagaren + Tillbaka till deltagaren @@ -275,7 +275,7 @@

- Tillbaka till deltagaren + Tillbaka till deltagaren 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 5562564..762db0b 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 @@ -5,9 +5,10 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; 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 { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; @@ -26,13 +27,14 @@ import { PeriodiskRedovisningFormService } from './periodisk-redovisning-form.se ReactiveFormsModule, ReportLayoutModule, ReportDescriptionListModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, UiSkeletonModule, DigiNgDialogModule, DigiNgFormSelectModule, DigiNgFormCheckboxModule, UiRadiobuttonGroupModule, + UiLinkButtonModule, UiInputModule, ], providers: [PeriodiskRedovisningFormService], 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 6d1b9dc..219e3cd 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 @@ -17,7 +17,7 @@
{{lastSubmittedSignal | date:'longDate'}} kl {{lastSubmittedSignal | date:'shortTime'}}
- Tillbaka till deltagaren + Tillbaka till deltagaren @@ -80,10 +80,10 @@
Förhandsgranska - - Avbryt + + Avbryt  och gå tillbaka till deltagaren - +
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.module.ts index 460bdcb..ad33fc6 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.module.ts @@ -5,18 +5,19 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; +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 { ReportDescriptionListModule } from '../../../components/report-description-list/report-description-list.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { SignalFormComponent } from './signal-form.component'; import { SignalFormService } from './signal-form.service'; -import { UiInputModule } from '@ui/input/input.module'; -import { UiSelectModule } from '@ui/select/select.module'; -import { UiLoaderModule } from '@ui/loader/loader.module'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], @@ -28,7 +29,7 @@ import { UiLoaderModule } from '@ui/loader/loader.module'; ReactiveFormsModule, ReportLayoutModule, ConfirmDialogModule, - BackLinkModule, + UiBackLinkModule, UiRadiobuttonGroupModule, DigiNgFormDatepickerModule, UiSkeletonModule, @@ -38,6 +39,7 @@ import { UiLoaderModule } from '@ui/loader/loader.module'; DigiNgFormValidationMessageModule, ReportDescriptionListModule, UiInputModule, + UiLinkButtonModule, ], providers: [SignalFormService], exports: [SignalFormComponent], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0.component.html index 4ccc9b5..ec68ee9 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0.component.html @@ -49,10 +49,10 @@
Vidare till steg 2 - - Avbryt + + Avbryt  och gå tillbaka till deltagaren - +
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html index d4be6c6..711266f 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html @@ -12,7 +12,7 @@
{{submittedDate | date:'longDate'}} kl {{submittedDate | date:'shortTime'}}
- Tillbaka till deltagaren + Tillbaka till deltagaren diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html index afa0022..26f633a 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html @@ -12,7 +12,7 @@

{{notAllowedToReportWarning(avrop)}}

- Tillbaka till deltagaren + Tillbaka till deltagaren diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.module.ts index 85d26db..df37275 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.module.ts @@ -9,13 +9,14 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module'; import { IconModule } from '@msfa-shared/components/icon/icon.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UiCheckboxModule } from '@ui/checkbox/checkbox.module'; import { UiErrorListModule } from '@ui/error-list/error-list.module'; 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'; @@ -62,7 +63,7 @@ import { SlutredovisningFormService } from './slutredovisning-form.service'; DigiNgProgressProgressbarModule, ReportLayoutModule, ConfirmDialogModule, - BackLinkModule, + UiBackLinkModule, UiSkeletonModule, DigiNgFormSelectModule, UiLoaderModule, @@ -75,7 +76,7 @@ import { SlutredovisningFormService } from './slutredovisning-form.service'; UiErrorListModule, UiInputModule, SlutredovisningViewDescriptionListModule, - BackLinkModule, + UiLinkButtonModule, ], providers: [SlutredovisningFormService], exports: [SlutredovisningFormComponent], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.html index df8097c..ca77f42 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.html @@ -16,7 +16,7 @@
- Tillbaka till deltagaren + Tillbaka till deltagaren
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.module.ts index 5564cb8..4299e11 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; @@ -17,7 +17,7 @@ import { AvvikelseReportViewService } from './avvikelse-report-view.service'; RouterModule.forChild([{ path: '', component: AvvikelseReportViewComponent }]), LayoutModule, ReportLayoutModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, UiSkeletonModule, ], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.html index c7561fa..9fcaaee 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.html @@ -27,9 +27,7 @@
{{franvaro.expectedPresenceStartTime}} - {{franvaro.expectedPresenceEndTime}}
 -
- Tillbaka till deltagaren -
+ Tillbaka till deltagaren diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.module.ts index c03c8af..6b2ddd7 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; @@ -17,7 +17,7 @@ import { FranvaroReportViewService } from './franvaro-report-view.service'; RouterModule.forChild([{ path: '', component: FranvaroReportViewComponent }]), LayoutModule, ReportLayoutModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, UiSkeletonModule, ], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.html index b78e11a..8badbb3 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.html @@ -22,7 +22,7 @@
- Tillbaka till deltagaren + Tillbaka till deltagaren
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.module.ts index 328f067..7096a49 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; @@ -17,7 +17,7 @@ import { GemensamPlaneringViewService } from './gemensam-planering-view.service' RouterModule.forChild([{ path: '', component: GemensamPlaneringViewComponent }]), LayoutModule, ReportLayoutModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, UiSkeletonModule, ], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.html index 3bb230a..89a1e20 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.component.html @@ -12,7 +12,7 @@
{{report.comment}}
- Tillbaka till deltagaren + Tillbaka till deltagaren
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.module.ts index 4100c0c..58f0ad3 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/informativ-rapport-view/informativ-rapport-view.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; @@ -17,7 +17,7 @@ import { InformativRapportViewService } from './informativ-rapport-view.service' RouterModule.forChild([{ path: '', component: InformativRapportViewComponent }]), LayoutModule, ReportLayoutModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, UiSkeletonModule, ], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html index 8c32f76..0a7b4ed 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html @@ -30,7 +30,7 @@
- Tillbaka till deltagaren + Tillbaka till deltagaren
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.module.ts index 1b013d1..02dfc7d 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; @@ -18,7 +18,7 @@ import { PeriodiskRedovisningViewService } from './periodisk-redovisning-view.se RouterModule.forChild([{ path: '', component: PeriodiskRedovisningViewComponent }]), LayoutModule, ReportLayoutModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, HideTextModule, UiSkeletonModule, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.module.ts index 40319a6..1f42fa6 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.module.ts @@ -1,14 +1,14 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UiLoaderModule } from '@ui/loader/loader.module'; import { UiSkeletonModule } from '@ui/skeleton/skeleton.module'; import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; +import { SlutredovisningViewDescriptionListModule } from '../../../components/slutredovisning-view-description-list/slutredovisning-view-description-list.module'; import { SlutredovisningViewComponent } from './slutredovisning-view.component'; import { SlutredovisningViewService } from './slutredovisning-view.service'; -import { SlutredovisningViewDescriptionListModule } from '../../../components/slutredovisning-view-description-list/slutredovisning-view-description-list.module'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], @@ -18,7 +18,7 @@ import { SlutredovisningViewDescriptionListModule } from '../../../components/sl RouterModule.forChild([{ path: '', component: SlutredovisningViewComponent }]), LayoutModule, ReportLayoutModule, - BackLinkModule, + UiBackLinkModule, UiLoaderModule, UiSkeletonModule, SlutredovisningViewDescriptionListModule, diff --git a/apps/mina-sidor-fa/src/app/pages/my-account/my-account.component.scss b/apps/mina-sidor-fa/src/app/pages/my-account/my-account.component.scss index 78d1b03..c33e675 100644 --- a/apps/mina-sidor-fa/src/app/pages/my-account/my-account.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/my-account/my-account.component.scss @@ -9,10 +9,6 @@ align-items: center; } - &__logout { - @include msfa__button('secondary'); - } - &__contents { display: flex; flex-direction: column; diff --git a/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.component.html b/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.component.html index bc928cf..5b676e3 100644 --- a/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.component.html +++ b/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.component.html @@ -3,7 +3,7 @@

Oj då! Vi kan inte hitta sidan.

Det kan bero på att länken du använder är felaktig eller att sidan inte längre finns.

- Tillbaka till startsidan + Tillbaka till startsidan
diff --git a/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.module.ts b/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.module.ts index 7a3abb3..6f89ff2 100644 --- a/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/page-not-found/page-not-found.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { PageNotFoundComponent } from './page-not-found.component'; @NgModule({ @@ -12,7 +12,7 @@ import { PageNotFoundComponent } from './page-not-found.component'; CommonModule, RouterModule.forChild([{ path: '', component: PageNotFoundComponent }]), LayoutModule, - BackLinkModule, + UiBackLinkModule, ], }) export class PageNotFoundModule {} diff --git a/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.component.html b/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.component.html index d01376c..97088ec 100644 --- a/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.component.html +++ b/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.component.html @@ -6,7 +6,7 @@ Det verkar som att du saknar behörigheter att komma in på sidan. Kontakta verksamhetens behörighetsadministratör.

- Tillbaka till startsidan + Tillbaka till startsidan
diff --git a/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.module.ts b/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.module.ts index 99428e6..36807f6 100644 --- a/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/unauthorized/unauthorized.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { UiBackLinkModule } from '@ui/back-link/back-link.module'; import { UnauthorizedComponent } from './unauthorized.component'; @NgModule({ @@ -12,7 +12,7 @@ import { UnauthorizedComponent } from './unauthorized.component'; CommonModule, RouterModule.forChild([{ path: '', component: UnauthorizedComponent }]), LayoutModule, - BackLinkModule, + UiBackLinkModule, ], }) export class UnauthorizedModule {} diff --git a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.html b/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.html deleted file mode 100644 index 093147c..0000000 --- a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.html +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.scss b/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.scss deleted file mode 100644 index 13ba8b9..0000000 --- a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.scss +++ /dev/null @@ -1,12 +0,0 @@ -@import 'mixins/buttons'; -@import 'mixins/link'; - -.back-link { - &--link { - @include msfa__link(true); - } - - &--button { - @include msfa__button('secondary'); - } -} diff --git a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.ts b/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.ts deleted file mode 100644 index 9ed6f7c..0000000 --- a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { IconType } from '@msfa-enums/icon-type.enum'; - -@Component({ - selector: 'msfa-back-link', - templateUrl: './back-link.component.html', - styleUrls: ['./back-link.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class BackLinkComponent { - private readonly _defaultClass = 'back-link'; - @Input() route: string[]; - @Input() showIcon = true; - @Input() asButton = false; - iconType = IconType; - - get backLinkClass(): string { - if (this.asButton) { - return `${this._defaultClass} ${this._defaultClass}--button`; - } - - return `${this._defaultClass} ${this._defaultClass}--link`; - } -} diff --git a/libs/styles/src/mixins/_buttons.scss b/libs/styles/src/mixins/_buttons.scss index b71c88f..72bb19f 100644 --- a/libs/styles/src/mixins/_buttons.scss +++ b/libs/styles/src/mixins/_buttons.scss @@ -1,9 +1,12 @@ @import '~@digi/core/dist/collection/components/_button/button/button.css'; +@import 'variables/colors'; +@import 'variables/gutters'; +@import 'functions/rem'; @mixin msfa__button($type: 'primary') { padding: var(--digi-button--padding); border-radius: var(--digi-button--border-radius); - transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; + transition: all 0.2s; text-decoration: none; font-weight: var(--digi-button--font-weight); font-size: var(--digi-button--font-size); @@ -40,6 +43,7 @@ &:focus { background-color: var(--digi-button--background--secondary--hover); color: var(--digi-button--color--secondary); + border-color: var(--digi-button--border-color); } } &--tertiary { @@ -62,3 +66,78 @@ font-size: var(--digi-button--font-size--l); } } + +@mixin ui__rounded-button() { + display: inline-flex; + align-items: center; + text-decoration: none; + border-radius: 2rem; + gap: 1rem; + font-weight: var(--digi-button--font-weight); + font-size: var(--digi-button--font-size); + padding: rem(12) rem(16); + transition: all 0.2s; + border: rem(2) solid var(--digi-button--border-color); + outline: var(--digi-button--outline); + + &:hover, + &:focus { + outline: var(--digi-button--outline--focus); + border-color: var(--digi-button--border-color--hover); + } + + &--rounded-primary { + background-color: var(--digi-button--background); + color: var(--digi-button--color); + + &:hover, + &:focus { + background-color: var(--digi-button--background--hover); + color: var(--digi-button--color--hover); + } + } + &--rounded-secondary { + background-color: var(--digi-button--background--secondary); + color: var(--digi-button--color--secondary); + + &:hover, + &:focus { + background-color: var(--digi-button--background--secondary--hover); + color: var(--digi-button--color--secondary); + border-color: var(--digi-button--border-color); + } + } + &--rounded-primary-alt { + background-color: $digi--color--profile--secondary; + color: $digi--color--profile; + border-color: $digi--color--profile--secondary; + + &:hover, + &:focus { + background-color: $digi--color--profile--secondary--light; + border-color: $digi--color--profile--secondary--light; + } + } + + &--rounded-secondary-alt { + background-color: transparent; + color: $digi--color--profile--secondary; + border-color: $digi--color--profile--secondary; + + &:hover, + &:focus { + color: $digi--color--profile; + border-color: $digi--color--profile--secondary--light; + background-color: $digi--color--profile--secondary--light; + } + } + + &--s { + padding: rem(10) rem(14); + font-size: var(--digi-button--font-size--s); + } + + &--l { + padding: rem(16) rem(20); + } +} diff --git a/libs/styles/src/variables/_colors.scss b/libs/styles/src/variables/_colors.scss index fdd7c2b..65aca1d 100644 --- a/libs/styles/src/variables/_colors.scss +++ b/libs/styles/src/variables/_colors.scss @@ -4,4 +4,8 @@ $digi--ui--color--primary-light: lighten($digi--ui--color--primary, 10%); $digi--ui--color--primary: $digi--ui--color--stratos; +$digi--color--profile: var(--digi--ui--color--primary); +$digi--color--profile--secondary: var(--digi--ui--color--secondary); +$digi--color--profile--secondary--light: #abff5c; + // Local variables diff --git a/libs/ui/src/back-link/back-link.component.html b/libs/ui/src/back-link/back-link.component.html new file mode 100644 index 0000000..4035d7c --- /dev/null +++ b/libs/ui/src/back-link/back-link.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/libs/ui/src/back-link/back-link.component.scss b/libs/ui/src/back-link/back-link.component.scss new file mode 100644 index 0000000..3905aba --- /dev/null +++ b/libs/ui/src/back-link/back-link.component.scss @@ -0,0 +1,6 @@ +@import 'mixins/buttons'; +@import 'mixins/link'; + +.ui-back-link { + @include msfa__link(true); +} diff --git a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.spec.ts b/libs/ui/src/back-link/back-link.component.spec.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.component.spec.ts rename to libs/ui/src/back-link/back-link.component.spec.ts diff --git a/libs/ui/src/back-link/back-link.component.ts b/libs/ui/src/back-link/back-link.component.ts new file mode 100644 index 0000000..22c94c7 --- /dev/null +++ b/libs/ui/src/back-link/back-link.component.ts @@ -0,0 +1,11 @@ +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; + +@Component({ + selector: 'ui-back-link', + templateUrl: './back-link.component.html', + styleUrls: ['./back-link.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class BackLinkComponent { + @Input() uiRouterLink: string | string[]; +} diff --git a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.module.ts b/libs/ui/src/back-link/back-link.module.ts similarity index 71% rename from apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.module.ts rename to libs/ui/src/back-link/back-link.module.ts index 9702513..93ebf72 100644 --- a/apps/mina-sidor-fa/src/app/shared/components/back-link/back-link.module.ts +++ b/libs/ui/src/back-link/back-link.module.ts @@ -1,13 +1,12 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { IconModule } from '../icon/icon.module'; import { BackLinkComponent } from './back-link.component'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [BackLinkComponent], - imports: [CommonModule, RouterModule, IconModule], + imports: [CommonModule, RouterModule], exports: [BackLinkComponent], }) -export class BackLinkModule {} +export class UiBackLinkModule {} diff --git a/libs/ui/src/link-button/link-button-type.enum.ts b/libs/ui/src/link-button/link-button-type.enum.ts index a7ed4f6..8580cac 100644 --- a/libs/ui/src/link-button/link-button-type.enum.ts +++ b/libs/ui/src/link-button/link-button-type.enum.ts @@ -2,4 +2,9 @@ export enum UiLinkButtonType { PRIMARY = 'primary', SECONDARY = 'secondary', TERTIARY = 'tertiary', + + ROUNDED_PRIMARY = 'rounded-primary', + ROUNDED_SECONDARY = 'rounded-secondary', + ROUNDED_PRIMARY_ALT = 'rounded-primary-alt', + ROUNDED_SECONDARY_ALT = 'rounded-secondary-alt', } diff --git a/libs/ui/src/link-button/link-button.component.html b/libs/ui/src/link-button/link-button.component.html index ec62958..96a1733 100644 --- a/libs/ui/src/link-button/link-button.component.html +++ b/libs/ui/src/link-button/link-button.component.html @@ -5,6 +5,7 @@ [queryParams]="uiQueryParams" > + diff --git a/libs/ui/src/link-button/link-button.component.scss b/libs/ui/src/link-button/link-button.component.scss index 4678c2a..553a80d 100644 --- a/libs/ui/src/link-button/link-button.component.scss +++ b/libs/ui/src/link-button/link-button.component.scss @@ -7,3 +7,10 @@ width: 100%; } } +.ui-link-rounded-button { + @include ui__rounded-button; + + &--full-width { + width: 100%; + } +} diff --git a/libs/ui/src/link-button/link-button.component.ts b/libs/ui/src/link-button/link-button.component.ts index 42bb9e4..2235c7b 100644 --- a/libs/ui/src/link-button/link-button.component.ts +++ b/libs/ui/src/link-button/link-button.component.ts @@ -9,7 +9,6 @@ import { UiLinkButtonType } from './link-button-type.enum'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class LinkButtonComponent { - private readonly _defaultClass = 'ui-link-button'; @Input() uiType: UiLinkButtonType = UiLinkButtonType.PRIMARY; @Input() uiSize: 's' | 'm' | 'l' = 'm'; @Input() uiFullWidth = false; @@ -17,15 +16,25 @@ export class LinkButtonComponent { @Input() uiHref: string; @Input() uiQueryParams: Params = null; + roundedButtonTypes: UiLinkButtonType[] = [ + UiLinkButtonType.ROUNDED_PRIMARY, + UiLinkButtonType.ROUNDED_PRIMARY_ALT, + UiLinkButtonType.ROUNDED_SECONDARY, + UiLinkButtonType.ROUNDED_SECONDARY_ALT, + ]; + get linkButtonClass(): string { - let currentClass = `${this._defaultClass} ${this._defaultClass}--${this.uiSize}`; + const defaultClass = this.isRoundedButtonType ? 'ui-link-rounded-button' : 'ui-link-button'; + let currentClass = `${defaultClass} ${defaultClass}--${this.uiSize} ${defaultClass}--${this.uiType}`; if (this.uiFullWidth) { - currentClass = `${currentClass} ${this._defaultClass}--full-width`; - } - if (this.uiType) { - currentClass = `${currentClass} ${this._defaultClass}--${this.uiType as string}`; + currentClass = `${currentClass} ${defaultClass}--full-width`; } + return currentClass; } + + get isRoundedButtonType(): boolean { + return this.roundedButtonTypes.includes(this.uiType); + } }