feat(employee): Utförande verksamheter select is now wrapping long text instead of ellipsis. Also when toggling the "Alla utförande verksamheter" checkbox the select is resetted. (TV-620)
Squashed commit of the following: commit 93d305948a5b5570882f1bbcafcef539105f7da5 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Sep 20 13:45:35 2021 +0200 Updated utförande verksamheter to make the text visible with large texts
This commit is contained in:
@@ -102,8 +102,7 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
|
|||||||
this.utforandeVerksamheterFormControlName,
|
this.utforandeVerksamheterFormControlName,
|
||||||
this.utforandeVerksamheterService.getTreeNodeDataFromUtforandeVerksamheter(
|
this.utforandeVerksamheterService.getTreeNodeDataFromUtforandeVerksamheter(
|
||||||
this.availableUtforandeVerksamheter,
|
this.availableUtforandeVerksamheter,
|
||||||
this.employee?.utforandeVerksamheter,
|
this.employee?.utforandeVerksamheter
|
||||||
this.employee?.allaUtforandeVerksamheter
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
])
|
])
|
||||||
@@ -174,8 +173,7 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
|
|||||||
utforandeVerksamheter: new FormControl(
|
utforandeVerksamheter: new FormControl(
|
||||||
this.utforandeVerksamheterService.getTreeNodeDataFromUtforandeVerksamheter(
|
this.utforandeVerksamheterService.getTreeNodeDataFromUtforandeVerksamheter(
|
||||||
this.availableUtforandeVerksamheter,
|
this.availableUtforandeVerksamheter,
|
||||||
this.employee?.utforandeVerksamheter,
|
this.employee?.utforandeVerksamheter
|
||||||
this.employee?.allaUtforandeVerksamheter
|
|
||||||
),
|
),
|
||||||
[]
|
[]
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -80,12 +80,11 @@
|
|||||||
[attr.aria-controls]="'expansion-panel-'+node.uuid"
|
[attr.aria-controls]="'expansion-panel-'+node.uuid"
|
||||||
(click)="onSetExpandedChild(parentNode, node)"
|
(click)="onSetExpandedChild(parentNode, node)"
|
||||||
>
|
>
|
||||||
<span class="expanded-tree-node__child-node-expansion-btn__text">{{node.label}}</span>
|
|
||||||
<span
|
<span
|
||||||
class="expanded-tree-node__child-node-expansion-btn__has-selection-dot"
|
class="expanded-tree-node__child-node-expansion-btn__text"
|
||||||
*ngIf="hasSelectedDescendant(node)"
|
[ngClass]="{'expanded-tree-node__child-node-expansion-btn__text--selected': hasSelectedDescendant(node)}"
|
||||||
aria-hidden="true"
|
>{{node.label}}</span
|
||||||
></span>
|
>
|
||||||
<digi-icon-arrow-right class="expanded-tree-node__child-node-expansion-btn__icon"></digi-icon-arrow-right>
|
<digi-icon-arrow-right class="expanded-tree-node__child-node-expansion-btn__icon"></digi-icon-arrow-right>
|
||||||
</button>
|
</button>
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -42,9 +42,6 @@
|
|||||||
h5,
|
h5,
|
||||||
h6 {
|
h6 {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
overflow: hidden;
|
|
||||||
white-space: nowrap;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,7 +71,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__child-node-expansion-btn {
|
&__child-node-expansion-btn {
|
||||||
display: inline-flex;
|
display: flex;
|
||||||
padding: 0.3125rem 0.9375rem;
|
padding: 0.3125rem 0.9375rem;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -83,10 +80,8 @@
|
|||||||
border-width: 0;
|
border-width: 0;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
white-space: nowrap;
|
|
||||||
font-size: var(--digi--typography--font-size--s);
|
font-size: var(--digi--typography--font-size--s);
|
||||||
text-align: center;
|
gap: var(--digi--layout--gutter--s);
|
||||||
position: relative;
|
|
||||||
|
|
||||||
&:hover,
|
&:hover,
|
||||||
&:focus {
|
&:focus {
|
||||||
@@ -104,21 +99,22 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__text {
|
&__text {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
position: relative;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
margin-right: $digi--layout--gutter--s;
|
padding-right: 1.2em;
|
||||||
display: block;
|
|
||||||
overflow: hidden;
|
|
||||||
white-space: nowrap;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__has-selection-dot {
|
&--selected::after {
|
||||||
width: 1rem;
|
content: '';
|
||||||
height: 1rem;
|
width: 1em;
|
||||||
border-radius: 50%;
|
height: 1em;
|
||||||
background-color: var(--digi--ui--color--success);
|
border-radius: 100%;
|
||||||
margin-right: $digi--layout--gutter--s;
|
background-color: var(--digi--ui--color--success);
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__icon {
|
&__icon {
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ export class UtforandeVerksamheterService {
|
|||||||
|
|
||||||
getTreeNodeDataFromUtforandeVerksamheter(
|
getTreeNodeDataFromUtforandeVerksamheter(
|
||||||
availableUtforandeVerksamhetList: UtforandeVerksamhet[],
|
availableUtforandeVerksamhetList: UtforandeVerksamhet[],
|
||||||
selectedUtforandeVerksamhetList: EmployeeUtforandeVerksamhet[],
|
selectedUtforandeVerksamhetList: EmployeeUtforandeVerksamhet[]
|
||||||
selectAll = false
|
|
||||||
): TreeNode | null {
|
): TreeNode | null {
|
||||||
let treeNode: TreeNode | null = null;
|
let treeNode: TreeNode | null = null;
|
||||||
|
|
||||||
@@ -66,17 +65,18 @@ export class UtforandeVerksamheterService {
|
|||||||
const utforandeVerksahmetTreeNode: TreeNode = {
|
const utforandeVerksahmetTreeNode: TreeNode = {
|
||||||
label: utforandeVerksamhet.name,
|
label: utforandeVerksamhet.name,
|
||||||
toggleAllChildrenLabel: 'Välj alla adresser',
|
toggleAllChildrenLabel: 'Välj alla adresser',
|
||||||
isSelected:
|
isSelected: this.isSelectedUtforandeVerksamhet(utforandeVerksamhet, selectedUtforandeVerksamhetList),
|
||||||
selectAll || this.isSelectedUtforandeVerksamhet(utforandeVerksamhet, selectedUtforandeVerksamhetList),
|
|
||||||
value: utforandeVerksamhet,
|
value: utforandeVerksamhet,
|
||||||
childItemType: 'Adresser',
|
childItemType: 'Adresser',
|
||||||
children: utforandeVerksamhet.adresser
|
children: utforandeVerksamhet.adresser
|
||||||
? utforandeVerksamhet.adresser.map(adress => {
|
? utforandeVerksamhet.adresser.map(adress => {
|
||||||
return {
|
return {
|
||||||
label: adress.name,
|
label: adress.name,
|
||||||
isSelected:
|
isSelected: this.isSelectedUtforandeAdress(
|
||||||
selectAll ||
|
utforandeVerksamhet.id,
|
||||||
this.isSelectedUtforandeAdress(utforandeVerksamhet.id, adress, selectedUtforandeVerksamhetList),
|
adress,
|
||||||
|
selectedUtforandeVerksamhetList
|
||||||
|
),
|
||||||
value: adress,
|
value: adress,
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user