Skip to content

Commit 07aeb73

Browse files
committed
FO-2760 Startet på tabell for visning av brukere
1 parent 6e91cce commit 07aeb73

File tree

6 files changed

+71
-2
lines changed

6 files changed

+71
-2
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React from 'react';
2+
3+
export const UserTableHeader = () => {
4+
return (
5+
<tr className="user-table__header">
6+
<HeaderCell name="Fødselsnummer" />
7+
<HeaderCell name="Navn" />
8+
<HeaderCell name="Oppfølging startet" />
9+
<HeaderCell name="Oppfølgingsenhet" />
10+
<HeaderCell name="Beslutter" />
11+
<HeaderCell name="Status" />
12+
<HeaderCell name="Utkast sist endret" />
13+
</tr>
14+
);
15+
};
16+
17+
const HeaderCell = (props: { name: string }) => {
18+
return <td className="user-table__header-title">{props.name}</td>;
19+
};
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import React from 'react';
2+
import { Bruker } from '../../rest/data/bruker';
3+
import { formatDateStr, formatDateTime } from '../../utils/date-utils';
4+
5+
export const UserRow = (props: {bruker: Bruker}) => {
6+
const {
7+
fnr, fornavn, etternavn, utkastSistEndret,
8+
oppfolgingsenhetNavn, oppfolgingStartet,
9+
beslutterNavn, status
10+
} = props.bruker;
11+
12+
return (
13+
<tr className="user-table__row">
14+
<td>{fnr}</td>
15+
<td>{fornavn + ' ' + etternavn}</td>
16+
<td>{formatDateStr(oppfolgingStartet)}</td>
17+
<td>{oppfolgingsenhetNavn}</td>
18+
<td>{beslutterNavn}</td>
19+
<td>{status}</td>
20+
<td>{formatDateTime(utkastSistEndret)}</td>
21+
</tr>
22+
);
23+
};
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
.user-table {
3+
4+
&__header-title {
5+
font-size: 18px;
6+
font-weight: bolder;
7+
}
8+
9+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import React from 'react';
2+
import { Bruker } from '../../rest/data/bruker';
3+
import { UserRow } from './user-table-row';
4+
import { UserTableHeader } from './user-table-header';
5+
import './user-table.less';
6+
7+
export const UserTable = (props: { brukere: Bruker[] }) => {
8+
return (
9+
<table>
10+
<UserTableHeader />
11+
{props.brukere.map((bruker, idx) => <UserRow bruker={bruker} key={idx} />)}
12+
</table>
13+
);
14+
};

src/hovedside/hovedside.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
display: grid;
66
grid-column-gap: 1rem;
7-
grid-template-columns: 25% 75%;
7+
grid-template-columns: 20% 80%;
88
}

src/hovedside/hovedside.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ import './hovedside.less';
44
import { StatusFilter } from '../components/status-filter/status-filter';
55
import { EnhetFilter } from '../components/enhet-filter/enhet-filter';
66
import { Sokefelt } from '../components/sokefelt/sokefelt';
7+
import { UserTable } from '../components/user-table/user-table';
8+
import { useFetchStore } from '../stores/fetch-store';
79

810
export const Hovedside = () => {
11+
const { brukere } = useFetchStore();
12+
913
return (
1014
<main className="hovedside">
1115
<DataFetcher>
@@ -15,7 +19,7 @@ export const Hovedside = () => {
1519
<EnhetFilter/>
1620
</div>
1721
<div className="table-column">
18-
<p>TODO</p>
22+
<UserTable brukere={brukere.data} />
1923
</div>
2024
</DataFetcher>
2125
</main>

0 commit comments

Comments
 (0)