Skip to content

Commit

Permalink
fiks kalender
Browse files Browse the repository at this point in the history
  • Loading branch information
marthehagen committed Nov 20, 2024
1 parent 00c14b1 commit 55f702d
Showing 1 changed file with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { CalendarIcon } from '@navikt/aksel-icons';
import CalendarLabels from 'components/labels/CalendarLabels';
import { FunctionComponent } from 'react';
import { FormattedMessage, useIntl } from 'react-intl';
import { barnehagestartDato } from 'steps/barnehageplass/BarnehageplassSteg';
import { Arbeidssituasjon, Arbeidsstatus } from 'types/Arbeidssituasjon';
import { OmBarnet } from 'types/Barnet';
import { Fordeling } from 'types/Fordeling';
Expand Down Expand Up @@ -107,6 +108,8 @@ const OppsummeringHarRett: FunctionComponent<Props> = ({
const fornavnSøker2 = getFornavnPåSøker2(hvemPlanlegger, intl);
const fornavnSøker2Genitiv = fornavnSøker2 ? getNavnGenitivEierform(fornavnSøker2, intl.locale) : undefined;

const barnehagestartdato = barnehagestartDato(barnet);

return (
<VStack gap="10">
<ExpansionCard aria-label="" onToggle={onToggleExpansionCard} size="small">
Expand Down Expand Up @@ -298,7 +301,6 @@ const OppsummeringHarRett: FunctionComponent<Props> = ({
</BodyShort>
</BluePanel>
)}
<CalendarLabels hvemPlanlegger={hvemPlanlegger} barnet={barnet} hvemHarRett={hvemHarRett} />
<UttaksplanKalender
bareFarHarRett={bareFarMedmorHarRett}
erFarEllerMedmor={erFarEllerMedmor}
Expand All @@ -307,6 +309,14 @@ const OppsummeringHarRett: FunctionComponent<Props> = ({
annenPartsPerioder={planforslag.søker2}
navnAnnenPart="Test"
barn={mapOmBarnetTilBarn(barnet)}
planleggerLegend={
<CalendarLabels
hvemPlanlegger={hvemPlanlegger}
barnet={barnet}
hvemHarRett={hvemHarRett}
/>
}
barnehagestartdato={barnehagestartdato}
/>
</VStack>
</ExpansionCard.Content>
Expand Down

0 comments on commit 55f702d

Please sign in to comment.