Skip to content

Commit 46c4476

Browse files
committed
fix: use only date instead of datetime in form state
1 parent e6422ff commit 46c4476

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

e2e/mocked-fhir.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ test('can submit 100% sykmelding', async ({ page }) => {
3535
},
3636
aktivitet: {
3737
type: 'AKTIVITET_IKKE_MULIG',
38-
fom: '2024-02-14T23:00:00.000Z',
39-
tom: '2024-02-17T23:00:00.000Z',
38+
fom: '2024-02-15',
39+
tom: '2024-02-18',
4040
grad: null,
4141
},
4242
},
@@ -70,8 +70,8 @@ test('shall be able to edit diagnose', async ({ page }) => {
7070
diagnoser: { hoved: { code: 'D290', system: 'ICD10', text: 'Godartet svulst i penis' } },
7171
aktivitet: {
7272
type: 'AKTIVITET_IKKE_MULIG',
73-
fom: '2024-02-14T23:00:00.000Z',
74-
tom: '2024-02-17T23:00:00.000Z',
73+
fom: '2024-02-15',
74+
tom: '2024-02-18',
7575
grad: null,
7676
},
7777
},
@@ -104,8 +104,8 @@ test('can submit gradert sykmelding', async ({ page }) => {
104104
},
105105
aktivitet: {
106106
type: 'GRADERT',
107-
fom: '2024-02-14T23:00:00.000Z',
108-
tom: '2024-02-17T23:00:00.000Z',
107+
fom: '2024-02-15',
108+
tom: '2024-02-18',
109109
grad: '50',
110110
},
111111
},

src/components/ny-sykmelding-form/aktivitet/AktivitetSection.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
} from '@navikt/ds-react'
1111

1212
import { cn } from '@utils/tw'
13+
import { dateOnly } from '@utils/date'
1314

1415
import { AktivitetIkkeMuligType, useController, useFormContext } from '../NySykmeldingFormValues'
1516

@@ -49,7 +50,6 @@ function AktivitetSection(): ReactElement {
4950
},
5051
})
5152
const { datepickerProps, toInputProps, fromInputProps } = useRangeDatepicker({
52-
fromDate: new Date('Aug 23 2019'),
5353
onRangeChange: (range) => {
5454
if (!range) {
5555
aktivitetField.field.onChange({
@@ -62,8 +62,8 @@ function AktivitetSection(): ReactElement {
6262

6363
aktivitetField.field.onChange({
6464
...aktivitetField.field.value,
65-
fom: range.from,
66-
tom: range.to,
65+
fom: range.from ? dateOnly(range.from) : null,
66+
tom: range.to ? dateOnly(range.to) : null,
6767
})
6868
},
6969
onValidate: (range) => {

src/utils/date.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { format, getDate, isSameDay, isSameMonth, isSameYear } from 'date-fns'
1+
import { format, formatISO, getDate, isSameDay, isSameMonth, isSameYear } from 'date-fns'
22
import { nb } from 'date-fns/locale/nb'
33

44
export function toReadableDateNoYear(date: string | Date): string {
@@ -24,3 +24,7 @@ export function toReadableDatePeriod(fom: string | Date, tom: string | Date): st
2424
return `${toReadableDate(fom)} - ${toReadableDate(tom)}`
2525
}
2626
}
27+
28+
export function dateOnly(date: string | Date): string {
29+
return formatISO(date, { representation: 'date' })
30+
}

0 commit comments

Comments
 (0)