From 89c8a38faaaf05c4c53a3d443a16c244fd9e8457 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Tue, 7 Sep 2021 15:21:35 +0200 Subject: [PATCH 1/4] Updated copy --- .../employee-invite/employee-invite.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 5fb48a8..87053ce 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 @@ -3,24 +3,24 @@

Skapa personalkonto

-

Här kan du skicka ett mail med inbjudningslänk till en ny personal.

+

Här kan du skicka en inbjudningslänk via e-post för att skapa nya personalkonton.

Skicka en inbjudningslänk

    -
  1. Skriv in personalens mailadress och klicka på "Skicka inbjudningslänk".
    2. +
  2. Skriv in personalens e-postadresser i fältet och klicka på "Skicka inbjudningslänk".
  3. - Personalen öppnar inbjudningslänken via sin mail och genom identifiering med sitt Bank-ID skapas det nya + Personalen öppnar inbjudningslänken via sin e-post och genom identifiering med Bank-ID skapas det nya personalkontot.
  4. - När personalkontot är skapat ser man det i personallistan. Initialt saknar det nya personalkontot + När personalkontot är skapat ser du det i personallistan. Initialt saknar det nya personalkontot behörigheter.
  5. - Tilldela personalkontot behörigheter genom att klicka på personalens namn i personallistan. Nu kan - personalen logga in och arbeta. + Tilldela personalkontot behörigheter genom att klicka på personalens namn i personallistan. Välj redigera + i personalkontot och lägg till behörigheter. Nu kan personalen logga in och arbeta.
From 36035e07be64d8b82b69a8a9e0703cfd2d23d6e0 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Tue, 7 Sep 2021 16:15:46 +0200 Subject: [PATCH 2/4] Removed default role from view --- .../edit-employee-form.component.ts | 8 ++- .../pages/employees/employees.component.html | 2 +- .../src/app/shared/models/role.model.ts | 54 ++++++++++--------- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts index b5aa3b6..a55e264 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts @@ -11,6 +11,7 @@ import { SimpleChanges, } from '@angular/core'; import { AbstractControl, FormControl, FormGroup } from '@angular/forms'; +import { RoleEnum } from '@msfa-enums/role.enum'; import { EmployeeEditRequest } from '@msfa-models/api/employee-edit.request.model'; import { Employee } from '@msfa-models/employee.model'; import { CustomError } from '@msfa-models/error/custom-error'; @@ -183,7 +184,12 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges { tjanstIds: this.employeeFormService .getSelectedTjanster(this.availableTjanster, +this.tjansterFormControl?.value) .map(tjanst => tjanst.tjanstId), - roles: this.employeeFormService.getRolesFromFormGroup(this.rolesFormGroup, this.availableRoles), + roles: [ + ...new Set([ + ...this.employeeFormService.getRolesFromFormGroup(this.rolesFormGroup, this.availableRoles), + RoleEnum.MSFA_Standard, + ]), + ], adressIds: this.toggleAllUtforandeVerksamhetFormControl.value ? [] : this.utforandeVerksamheterService.getSelectedAdressIdsFromTreeNode( 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 92ae324..72aa113 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 @@ -27,7 +27,7 @@ > --> diff --git a/apps/mina-sidor-fa/src/app/shared/models/role.model.ts b/apps/mina-sidor-fa/src/app/shared/models/role.model.ts index f5a6f53..751f203 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/role.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/role.model.ts @@ -6,30 +6,32 @@ export interface Role { } export function mapResponseToRoles(types: RoleEnum[] = []): Role[] { - return types.map(type => { - switch (type) { - case 'MSFA_Standard': - return { - name: 'Basanvändare', - type: RoleEnum[type], - }; - case 'MSFA_ReportAndPlanning': - return { - name: 'Rapportering, planering och information om deltagare', - type: RoleEnum[type], - }; - case 'MSFA_ReceiveDeltagare': - return { - name: 'Ta emot deltagare', - type: RoleEnum[RoleEnum[type]], - }; - case 'MSFA_AuthAdmin': - return { - name: 'Administrera behörigheter', - type: RoleEnum[RoleEnum[type]], - }; - default: - return; - } - }); + return types + .filter(type => type !== RoleEnum.MSFA_Standard) + .map(type => { + switch (type) { + case 'MSFA_Standard': + return { + name: 'Basanvändare', + type: RoleEnum[type], + }; + case 'MSFA_ReportAndPlanning': + return { + name: 'Rapportering, planering och information om deltagare', + type: RoleEnum[type], + }; + case 'MSFA_ReceiveDeltagare': + return { + name: 'Ta emot deltagare', + type: RoleEnum[RoleEnum[type]], + }; + case 'MSFA_AuthAdmin': + return { + name: 'Administrera behörigheter', + type: RoleEnum[RoleEnum[type]], + }; + default: + return; + } + }); } From d82432729480ae3754ad8e4876133bb6b9bd15c9 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Tue, 7 Sep 2021 16:32:23 +0200 Subject: [PATCH 3/4] Added confirmdialog when no roles are chosen --- .../edit-employee-form.component.html | 22 ++++++++++++++----- .../edit-employee-form.component.ts | 13 ++++++++++- .../employee-form.component.html | 4 ---- .../services/employee-form.service.ts | 6 +---- 4 files changed, 29 insertions(+), 16 deletions(-) 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 0f32eea..8787e78 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 @@ -91,12 +91,6 @@ > - - Du måste välja minst en behörighet - + +

+ Inga behörigheter har valts, det betyder att personalen inte kommer kunna utföra några arbetsuppgifter i systemet. + Är du säker att du vill spara? +

+ + Förnamn
{{employee.firstName}}
-
-
Förnamn
-
{{employee.firstName}}
-
Efternamn
{{employee.lastName}}
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/services/employee-form.service.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/services/employee-form.service.ts index 392b0b8..3c479a3 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/services/employee-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/services/employee-form.service.ts @@ -3,7 +3,6 @@ import { AbstractControl, FormControl, FormGroup } from '@angular/forms'; import { RoleEnum } from '@msfa-enums/role.enum'; import { Role } from '@msfa-models/role.model'; import { Tjanst } from '@msfa-models/tjanst.model'; -import { EmployeeValidator } from '@msfa-utils/validators/employee.validator'; @Injectable({ providedIn: 'root', @@ -48,10 +47,7 @@ export class EmployeeFormService { this.getFormControlName(role), new FormControl(this.isSelectedRole(role, selectedRoles), []), ]) - ), - { - validators: [EmployeeValidator.HasSelectedAtLeastOneRole(roles.map(role => this.getFormControlName(role)))], - } + ) ); } From 126c6e3666aee6a334faba6f06b4d8d103d5af6c Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Wed, 8 Sep 2021 07:09:12 +0200 Subject: [PATCH 4/4] Now using sys for API --- config/proxy.conf.api.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/proxy.conf.api.json b/config/proxy.conf.api.json index 8075d23..9e49ffb 100644 --- a/config/proxy.conf.api.json +++ b/config/proxy.conf.api.json @@ -1,6 +1,6 @@ { "/api": { - "target": "https://mina-sidor-fa-utv.tocp.arbetsformedlingen.se", + "target": "https://mina-sidor-fa-sys.tocp.arbetsformedlingen.se", "secure": false, "changeOrigin": true }