-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into historikk-i-tidligere-vedtaksperioder
- Loading branch information
Showing
83 changed files
with
2,000 additions
and
1,230 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import React, { FC } from 'react'; | ||
| import { useDatepicker, DatePicker } from '@navikt/ds-react'; | ||
| import { FamilieLesefelt } from '@navikt/familie-form-elements'; | ||
| import { nullableTilDato, tilLocaleDateString } from '../../App/utils/dato'; | ||
| import { formaterNullableIsoDato } from '../../App/utils/formatter'; | ||
|
|
||
| export const Datovelger: FC<{ | ||
| verdi: string | undefined; | ||
| settVerdi: (verdi: string | undefined) => void; | ||
| erLesevisning?: boolean; | ||
| label: string; | ||
| id: string; | ||
| feil?: string; | ||
| maksDato?: Date; | ||
| minDato?: Date; | ||
| }> = ({ settVerdi, erLesevisning, verdi, label, id, feil, minDato, maksDato }) => { | ||
| const { datepickerProps, inputProps } = useDatepicker({ | ||
| defaultSelected: nullableTilDato(verdi), | ||
| onDateChange: (dato) => settVerdi(dato && tilLocaleDateString(dato)), | ||
| toDate: maksDato, | ||
| fromDate: minDato, | ||
| }); | ||
|
|
||
| return ( | ||
| <div> | ||
| {erLesevisning ? ( | ||
| <FamilieLesefelt | ||
| size={'small'} | ||
| label={label} | ||
| verdi={formaterNullableIsoDato(verdi)} | ||
| /> | ||
| ) : ( | ||
| <DatePicker id={id} {...datepickerProps}> | ||
| <DatePicker.Input label={label} {...inputProps} error={feil} size={'medium'} /> | ||
| </DatePicker> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; |
14 changes: 10 additions & 4 deletions
14
src/frontend/Felles/Fødselsnummer/KopierbartNullableFødselsnummer.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,27 @@ | ||
| import React from 'react'; | ||
| import { formaterFødselsnummer } from '../../App/utils/formatter'; | ||
| import Clipboard from '@navikt/familie-clipboard'; | ||
| import { CopyButton } from '@navikt/ds-react'; | ||
| import styled from 'styled-components'; | ||
|
|
||
| const NoWrapSpan = styled.span` | ||
| white-space: nowrap; | ||
| font-size: 16px; | ||
| display: flex; | ||
| align-items: center; | ||
| `; | ||
|
|
||
| export const KopierbartNullableFødselsnummer: React.FC<{ fødselsnummer: string }> = ({ | ||
| fødselsnummer, | ||
| }) => { | ||
| return ( | ||
| <NoWrapSpan> | ||
| <Clipboard> | ||
| <span>{formaterFødselsnummer(fødselsnummer)}</span> | ||
| </Clipboard> | ||
| <span>{formaterFødselsnummer(fødselsnummer)}</span> | ||
| <CopyButton | ||
| size={'xsmall'} | ||
| copyText={formaterFødselsnummer(fødselsnummer)} | ||
| variant={'action'} | ||
| activeText={'kopiert'} | ||
| /> | ||
| </NoWrapSpan> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| @import (reference) '~nav-frontend-core/less/_variabler'; | ||
|
|
||
| .header { | ||
| position: sticky; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.