Skip to content

Commit ad7aa25

Browse files
FO-2772 legg til ikoner for status kolonne
1 parent 33ade22 commit ad7aa25

File tree

12 files changed

+76
-22
lines changed

12 files changed

+76
-22
lines changed
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

src/components/user-table/body/user-table-body.less

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,25 @@
1313

1414
.user-table-row {
1515
display: grid;
16-
grid-template-columns: repeat(8, 1fr) 200px;
17-
padding: 1.5rem 0;
16+
grid-template-columns: repeat(3, 2fr) 3fr repeat(3, 2fr) 1fr 200px;
17+
justify-items: start;
18+
padding: 1.3rem 0 1.7rem 0;
19+
20+
& > {
21+
padding-left: 7px;
22+
}
1823

1924
text-align: center;
20-
}
25+
26+
align-items: end;
27+
28+
&__status {
29+
display: grid;
30+
grid-template-columns: 2rem auto;
31+
align-items: end;
32+
.status_ikon {
33+
max-width: 1.6rem;
34+
}
35+
36+
}
37+
}

src/components/user-table/body/user-table-row.tsx

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import React from 'react';
2-
import { Bruker } from '../../../rest/data/bruker';
2+
import { Bruker, UtkastStatus } from '../../../rest/data/bruker';
33
import { formatDateStr, tidSiden } from '../../../utils/date-utils';
44
import { Normaltekst, Element } from 'nav-frontend-typografi';
55
import { fjernNavFraEnhetNavn, mapBrukerStatusTilTekst } from '../../../utils';
6+
import harBeslutterIcon from './status/har_beslutter.svg';
7+
import klarForUtsendelseIcon from './status/klar_for_utsendelse.svg';
8+
import trengerBeslutterIcon from './status/trenger_beslutter.svg';
9+
import trengerTilbakemeldingIcon from './status/trenger_tilbakemelding.svg';
10+
import venterPaResponsIcon from './status/venter_pa_respons.svg';
611

712
export const UserRow = (props: {bruker: Bruker}) => {
813
const {
@@ -16,11 +21,37 @@ export const UserRow = (props: {bruker: Bruker}) => {
1621
<Normaltekst>{etternavn + ', ' + fornavn}</Normaltekst>
1722
<Element>{fnr}</Element>
1823
<Normaltekst>{formatDateStr(vedtakStartet)}</Normaltekst>
19-
<Normaltekst>{mapBrukerStatusTilTekst(status)}</Normaltekst>
24+
<UtkastStatusData status={status}/>
2025
<Element>{beslutterNavn || '-'}</Element>
2126
<Normaltekst>{veilederNavn}</Normaltekst>
2227
<Normaltekst>{tidSiden(utkastSistEndret)}</Normaltekst>
2328
<Normaltekst>{fjernNavFraEnhetNavn(oppfolgingsenhetNavn)}</Normaltekst>
2429
</li>
2530
);
2631
};
32+
33+
const UtkastStatusData = (props: { status: UtkastStatus }) => {
34+
let statusIkon;
35+
switch (props.status) {
36+
case UtkastStatus.KLAR_FOR_BESLUTTER:
37+
statusIkon = trengerBeslutterIcon;
38+
break;
39+
case UtkastStatus.HAR_BESLUTTER:
40+
statusIkon = harBeslutterIcon;
41+
break;
42+
case UtkastStatus.VENTER_PA_VEILEDER:
43+
statusIkon = trengerTilbakemeldingIcon;
44+
break;
45+
case UtkastStatus.VENTER_PA_BESLUTTER:
46+
statusIkon = venterPaResponsIcon;
47+
break;
48+
case UtkastStatus.KLAR_TIL_UTSENDING:
49+
statusIkon = klarForUtsendelseIcon;
50+
break;
51+
}
52+
return (
53+
<span className={'user-table-row__status'}>
54+
<img className={'status_ikon'} src={statusIkon} alt={'status ikon'} />
55+
<Normaltekst>{mapBrukerStatusTilTekst(props.status)}</Normaltekst>
56+
</span>);
57+
};

src/components/user-table/header/user-table-header.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
.user-table-header {
44
display: grid;
5-
grid-template-columns: repeat(8, 1fr) 200px;
5+
grid-template-columns: repeat(3, 2fr) 3fr repeat(3, 2fr) 1fr 200px;
6+
justify-items: start;
67
padding-bottom: 1rem;
78
border-bottom: 1px solid @navGra60;
89

src/mock/data/brukere.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import faker from 'faker';
2-
import { Bruker, BrukerStatus } from '../../rest/data/bruker';
2+
import { Bruker, UtkastStatus } from '../../rest/data/bruker';
33
import { enheter } from './enheter';
44
import { randBetween } from '../../utils';
55

@@ -34,7 +34,7 @@ export const lagBrukere = (antallBrukere: number): Bruker[] => {
3434
vedtakStartet: faker.date.recent(30).toISOString(),
3535
oppfolgingsenhetId: randomEnhet.enhetId,
3636
oppfolgingsenhetNavn: randomEnhet.navn,
37-
status: faker.random.objectElement(BrukerStatus) as BrukerStatus,
37+
status: faker.random.objectElement(UtkastStatus) as UtkastStatus,
3838
utkastSistEndret: faker.date.recent().toISOString()
3939
};
4040

src/rest/data/bruker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
export enum BrukerStatus {
2+
export enum UtkastStatus {
33
KLAR_FOR_BESLUTTER = 'KLAR_FOR_BESLUTTER',
44
HAR_BESLUTTER = 'HAR_BESLUTTER',
55
VENTER_PA_VEILEDER = 'VENTER_PA_VEILEDER',
@@ -11,7 +11,7 @@ export interface Bruker {
1111
fnr: string;
1212
fornavn: string;
1313
etternavn: string;
14-
status: BrukerStatus;
14+
status: UtkastStatus;
1515
beslutterNavn: string | null;
1616
veilederNavn: string;
1717
utkastSistEndret: string; // dato

0 commit comments

Comments
 (0)