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

feat(employee): Now possible to submit edit employee form. (TV-513)

Browse Source 
Squashed commit of the following:

commit fc79d20601988735b407a54009426e10e233df39
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 7 13:24:30 2021 +0200

    Small fixes

commit bc8741bab9b3161d356d1375b7ab869b202a8195
Merge: 1ad9db8 cac0515
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 7 13:16:21 2021 +0200

    Merged develop

commit 1ad9db87e7f1f19fdb2cd3e2cfcc17e08c9ccfef
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 7 12:49:37 2021 +0200

    Stylechanges

commit 5a3b863f87f956ed90564fecbef9abe9460558bd
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 7 11:26:35 2021 +0200

    Now possible to edit employee-accounts

commit 0677f2ebeee12adeba6cb65a673781dea7a6c06d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 7 10:05:35 2021 +0200

    Updated models to include new structure

commit 76bde9e0afbbf44a09348ee8e4849b4816b0c39d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 7 08:43:25 2021 +0200

    edit employee

commit c8cf93b6bbeef0a3b4b6f141f36aea7ea86f399e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Sep 6 16:22:46 2021 +0200

    WIP

commit fe5cff4aa209c4da0025ebfb70b79d6a95c8d1f1
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Sep 6 15:46:26 2021 +0200

    Fixed issue not fetching new utforande verksamheter on page load

commit c997dbe80c8f9f5ec84aad2ac18805918b7ab6f5
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Sep 6 15:35:34 2021 +0200

    Added scrollPositionRestoration

commit 58ee0147ff553f2a97fdf143ddcbdf1b0241d26f
Merge: 27b595c 9a73ffe
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Sep 6 15:30:08 2021 +0200

    Merge branch 'develop' into feature/TV-513

commit 27b595cbf94dc1d95ad32a0da1943e2e6fce61c4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Sep 6 14:28:10 2021 +0200

    WIP

commit 81cb9df1869784a80f6747ac68bfdc81ae5d777a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Sep 6 13:21:41 2021 +0200

    Fixed roles
This commit is contained in:
Erik Tiekstra
2021-09-07 13:26:46 +02:00
parent cac0515c9c
commit bb4d88a8e0
37 changed files with 386 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ export class LayoutComponent extends UnsubscribeDirective {
const pageTitle = this.activatedRoute?.snapshot?.data?.title as string;
const urlTree = this.router.parseUrl(this.router.url);
this.titleService.setTitle(`Mina sidor FA${pageTitle ? ` - ${pageTitle}` : ''}`);
this.titleService.setTitle(`Mina sidor för fristående aktörer${pageTitle ? ` - ${pageTitle}` : ''}`);
if (urlTree.queryParams.code) {
void this.router.navigate([], {

23
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/expanded-tree-node/expanded-tree-node.component.scss
View File

@@ -1,5 +1,6 @@
@import 'variables/colors';
@import 'functions/rem';
@import 'mixins/list';
@import 'variables/colors';
@import 'variables/gutters';
.expanded-tree-node {
@@ -50,8 +51,8 @@
&__node {
&--leaf {
margin-top: 0.625rem;
padding-left: 0.625rem;
margin-top: $digi--layout--gutter--s;
padding-left: $digi--layout--gutter;
&:first-child {
margin-top: 0;
@@ -60,7 +61,7 @@
}
&__node-checkbox-presentation {
font-size: 1rem;
font-size: var(--digi--typography--font-size--s);
font-weight: 400;
display: block;
position: relative;
@@ -80,7 +81,7 @@
}
&--toggle-all {
margin: 1.25rem 0.625rem;
margin: 1.25rem $digi--layout--gutter;
}
&--checked &__box {
@@ -116,7 +117,7 @@
background-color: transparent;
align-items: center;
white-space: nowrap;
font-size: 0.875rem;
font-size: var(--digi--typography--font-size--s);
text-align: center;
position: relative;
@@ -125,11 +126,6 @@
background-color: var(--digi--ui--color--background--secondary);
}
&--focus {
border-top: 1px solid var(--digi--typography--color--text--disabled);
border-bottom: 1px solid var(--digi--typography--color--text--disabled);
}
&--active {
background-color: var(--digi--ui--color--primary);
color: var(--digi--ui--color--background);
@@ -143,7 +139,8 @@
&__text {
text-align: left;
flex-grow: 1;
max-width: 250px;
max-width: rem(450);
margin-right: $digi--layout--gutter--s;
display: block;
overflow: hidden;
white-space: nowrap;
@@ -155,7 +152,7 @@
height: 1rem;
border-radius: 50%;
background-color: var(--digi--ui--color--success);
margin-right: 10px;
margin-right: $digi--layout--gutter--s;
}
&__icon {

32
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/tree-nodes-selector-panel/tree-nodes-selector-panel.component.scss
View File

@@ -1,13 +1,15 @@
@import 'variables/colors';
@import 'functions/rem';
@import 'mixins/list';
@import 'variables/colors';
@import 'variables/gutters';
@import 'variables/shadows';
.tree-nodes-selector-panel {
position: relative;
background-color: var(--digi--ui--color--background);
min-width: 710px;
min-height: 144px;
box-shadow: 0 0.2rem 0.6rem 0 var(--digi--ui--color--shadow);
border-radius: 4px;
min-width: rem(710);
box-shadow: $msfa__shadow;
border-radius: var(--digi--ui--border--radius);
header {
margin: 0;
@@ -18,13 +20,11 @@
&__heading {
width: 100%;
height: 45px;
display: flex;
align-items: center;
margin: 0;
font-weight: 700;
font-size: 1rem;
padding: 0.625rem 0.9375rem;
font-size: var(--digi--typography--font-size--h4);
padding: $digi--layout--gutter--m $digi--layout--gutter;
border-bottom: 1px solid var(--digi--typography--color--text--disabled);
}
@@ -34,12 +34,11 @@
right: 0;
top: 0;
display: block;
background-image: none;
background-color: transparent;
border: 0 none transparent;
border-width: 0;
color: var(--digi--ui--color--danger);
padding: 0.625rem 0.9375rem;
font-size: 0.875rem;
padding: $digi--layout--gutter--m $digi--layout--gutter;
font-size: var(--digi--typography--font-size--xs);
}
&__expanded-nodes {
@@ -57,11 +56,12 @@
flex: 0 0 50%;
max-width: 50%;
overflow: auto;
padding-top: 15px;
padding-top: $digi--layout--gutter--m;
padding-bottom: $digi--layout--gutter--l;
border-left: 1px solid var(--digi--typography--color--text--disabled);
&:first-child {
border-left: 0 none transparent;
border-left-width: 0;
}
}
@@ -70,6 +70,6 @@
justify-content: center;
align-items: center;
background-color: var(--digi--ui--color--background--tertiary);
height: 60px;
padding: $digi--layout--gutter--m $digi--layout--gutter--l;
}
}

12
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/tree-nodes-selector-panel/tree-nodes-selector-panel.component.ts
View File

@@ -1,13 +1,13 @@
import { ButtonSize } from '@af/digi-ng/_button/button';
import {
Component,
OnInit,
ChangeDetectionStrategy,
Input,
Component,
ElementRef,
ViewChild,
Output,
EventEmitter,
Input,
OnInit,
Output,
ViewChild,
} from '@angular/core';
import {
FilterTreeNodeData,
@@ -24,7 +24,7 @@ import {
export class TreeNodesSelectorPanelComponent implements OnInit {
@Input() rootNode: TreeNodeModel | null = null;
@Input() headingText: string;
@Input() confirmationButtonText = 'Stäng';
@Input() confirmationButtonText = 'Spara';
@Output() selectedChangesConfirmed = new EventEmitter<TreeNodeModel>();
@Output() closePanelRequested = new EventEmitter<void>();

19
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/tree-nodes-selector/tree-nodes-selector.component.scss
View File

@@ -8,17 +8,19 @@
}
&__toggle-panel-btn {
position: relative;
display: flex;
border-radius: 0.375rem;
border: 1px solid var(--digi--ui--input--border--color);
background-color: var(--digi--ui--color--background);
color: var(--digi--ui--color--primary);
padding: 6px 12px;
width: 100%;
justify-content: space-between;
align-items: center;
font-size: var(--digi--typography--font-size--xs);
appearance: none;
width: 100%;
height: var(--digi--ui--input--height);
padding: var(--digi--ui--input--padding);
border: 0.0625rem solid var(--digi--ui--input--border--color);
cursor: pointer;
font-size: var(--digi--typography--font-size--m);
color: var(--digi--ui--color--background--overlay--opaque);
background-color: var(--digi--ui--color--background);
border-color: var(--digi-form-select--border-color);
&:focus {
border-color: var(--digi--ui--color--focus--light);
@@ -60,5 +62,6 @@
z-index: 10;
top: 100%;
left: 0;
margin-top: $digi--layout--gutter--xs;
}
}

12
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/tree-nodes-selector/tree-nodes-selector.component.ts
View File

@@ -1,14 +1,14 @@
import {
Component,
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
ElementRef,
EventEmitter,
forwardRef,
Input,
Output,
Renderer2,
ViewChild,
ElementRef,
Output,
EventEmitter,
ChangeDetectorRef,
} from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { UUID } from 'angular2-uuid';
@@ -37,7 +37,7 @@ interface PropagateTouchedFn {
})
export class TreeNodesSelectorComponent implements ControlValueAccessor {
@Input() headingText: string;
@Input() confirmationButtonText = 'Stäng';
@Input() confirmationButtonText = 'Spara';
@Input() isInvalid = false;
@Input() showValidation = false;
@Input() validationMessages: Array<string>;