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

more changes according to PR comments

Browse Source
This commit is contained in:
Zaid Abed Jaser
2021-04-30 13:12:28 +02:00
parent b6c9219818
commit 2dc620c723
7 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dafa-web/src/app/data/models/staff.model.ts
View File

@@ -6,7 +6,7 @@ export interface Staff {
staffId: string; staffId: string;
firstName: string; firstName: string;
lastName: string; lastName: string;
Utforandeverksamhet: string; utforandeverksamhet: string;
active: boolean; active: boolean;
service: string; service: string;
fullName?: string; fullName?: string;

18
apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html
View File

@@ -10,16 +10,14 @@
<form [formGroup]="formGroup" (ngSubmit)="submitForm()"> <form [formGroup]="formGroup" (ngSubmit)="submitForm()">
<div class="create-account__block"> <div class="create-account__block">
<h2>Personuppgifter</h2> <h2>Personuppgifter</h2>
<div class="create-account__combined-inputs"> <digi-ng-form-input
<digi-ng-form-input class="create-account__input"
class="create-account__input" formControlName="firstName"
formControlName="firstName" afLabel="Förnamn"
afLabel="Förnamn" afInvalidMessage="Förnamn är obligatoriskt"
afInvalidMessage="Förnamn är obligatoriskt" [afDisableValidStyle]="true"
[afDisableValidStyle]="true" [afInvalid]="firstNameControl.invalid && firstNameControl.dirty"
[afInvalid]="firstNameControl.invalid && firstNameControl.dirty" ></digi-ng-form-input>
></digi-ng-form-input>
</div>
<digi-ng-form-input <digi-ng-form-input
class="create-account__input" class="create-account__input"
formControlName="lastName" formControlName="lastName"

16
apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss
View File

@@ -17,14 +17,14 @@
&__permission-checkbox { &__permission-checkbox {
display: flex; display: flex;
height: 5em; height: 5rem;
align-items: center; align-items: center;
} }
&__fieldset { &__fieldset {
padding: 0; padding: 0;
border: 0; border: 0;
margin-top: 2em; margin-top: var(--digi--layout--gutter);
legend { legend {
width: 100%; width: 100%;
@@ -32,7 +32,7 @@
align-items: center; align-items: center;
margin: 0; margin: 0;
font-weight: var(--digi--typography--font-weight--bold); font-weight: var(--digi--typography--font-weight--bold);
font-size: 1.5em; font-size: 1.5rem;
padding-bottom: var(--digi--layout--gutter--s); padding-bottom: var(--digi--layout--gutter--s);
} }
} }
@@ -55,22 +55,16 @@
} }
&__footer { &__footer {
margin-top: 2em; margin-top: var(--digi--layout--gutter);
display: flex; display: flex;
gap: var(--digi--layout--gutter); gap: var(--digi--layout--gutter);
} }
} }
.assign-permission-checkbox {
display: flex;
height: 5em;
align-items: center;
}
.search-address { .search-address {
width: 30%; width: 30%;
} }
digi-ng-popover { digi-ng-popover {
margin-left: 1em; margin-left: var(--digi--layout--gutter);
} }

2
apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html
View File

@@ -21,7 +21,7 @@
</button> </button>
</th> </th>
<th scope="col" class="staff-list__column-head"> <th scope="col" class="staff-list__column-head">
<button class="staff-list__sort-button" (click)="handleSort('Utforandeverksamhet')"> <button class="staff-list__sort-button" (click)="handleSort('utforandeverksamhet')">
Utförandeverksamhet Utförandeverksamhet
<ng-container *ngIf="sortBy?.key === 'Utforandeverksamhet'"> <ng-container *ngIf="sortBy?.key === 'Utforandeverksamhet'">
<digi-icon-caret-up class="staff-list__sort-icon" *ngIf="!sortBy.reverse"></digi-icon-caret-up> <digi-icon-caret-up class="staff-list__sort-icon" *ngIf="!sortBy.reverse"></digi-icon-caret-up>

1
apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.scss
View File

@@ -20,7 +20,6 @@
align-items: center; align-items: center;
gap: var(--digi--layout--gutter); gap: var(--digi--layout--gutter);
cursor: pointer; cursor: pointer;
color: #1616b2;
} }
&__sort-icon { &__sort-icon {

10
apps/dafa-web/src/app/pages/start/start.component.html
View File

@@ -5,18 +5,12 @@
</digi-typography> </digi-typography>
<div class="start__wrapper"> <div class="start__wrapper">
<div class="start__main"> <div class="start__main">
<!-- Syntax fel i digi info card? --> <digi-info-card af-heading="Notiser" af-heading-level="h1" af-type="info" af-link-text="Deltagare">
<digi-info-card
af-heading="Notiser"
af-heading-level="h1"
af-type="info"
af-link-text="Deltagare"
af-link-href="/mina-deltagare"
>
<p> <p>
Det har kommit in nya avrop med deltagare, länken nedan tar dig till fliken Nya deltagare. Du finner den också Det har kommit in nya avrop med deltagare, länken nedan tar dig till fliken Nya deltagare. Du finner den också
i vänster menyn på sidan i vänster menyn på sidan
</p> </p>
<a [routerLink]="['/mina-deltagare']">Deltagare</a>
</digi-info-card> </digi-info-card>
</div> </div>

9
apps/dafa-web/src/app/pages/start/start.component.scss
View File

@@ -1,3 +1,4 @@
@import 'variables/gutters';
.start { .start {
&__wrapper { &__wrapper {
display: grid; display: grid;
@@ -6,16 +7,20 @@
'header header ' 'header header '
'main sidebar' 'main sidebar'
'footer footer '; 'footer footer ';
grid-gap: 3em; grid-gap: var(--digi--layout--gutter);
} }
&__main { &__main {
grid-area: main; grid-area: main;
a {
text-decoration: none;
color: var(--digi--typography--color--link);
}
} }
&__sidebar { &__sidebar {
grid-area: sidebar; grid-area: sidebar;
} }
&__sidebar-alert { &__sidebar-alert {
margin-top: 5%; margin-top: var(--digi--layout--gutter);
} }
&__footer { &__footer {
grid-area: footer; grid-area: footer;