Skip to content

Commit 35a2e3c

Browse files
committed
Fix visning av skjerming-form
1 parent c98b29b commit 35a2e3c

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const Steg2: React.FC = () => {
8282
<div>
8383
<PdlfForm />
8484
{getValues('fullmakt') && <FullmaktForm />}
85-
{(getValues('nomdata') || getValues('egenAnsattDatoFom')) && <NavAnsatt />}
85+
{(getValues('nomdata') || getValues('skjerming')) && <NavAnsatt />}
8686
{getValues('aareg') && <AaregForm />}
8787
{getValues(sigrunstubPensjonsgivendeAttributt) && <SigrunstubPensjonsgivendeForm />}
8888
{getValues(sigrunstubSummertSkattegrunnlagAttributt) && (

apps/dolly-frontend/src/main/js/src/components/fagsystem/nom/form/NavAnsattForm.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ import { useFormContext } from 'react-hook-form'
88
import { SkjermingForm } from '@/components/fagsystem/skjermingsregister/form/SkjermingForm'
99

1010
const nomdataPath = ['nomdata']
11-
const skjermingPaths = ['skjerming.egenAnsattDatoFom']
12-
// const skjermingPaths = ['skjerming.egenAnsattDatoFom', 'skjerming.egenAnsattDatoTom']
13-
// const skjermingPaths = ['skjerming']
11+
const skjermingPaths = ['skjerming.egenAnsattDatoFom', 'skjerming.egenAnsattDatoTom']
1412
const panelPaths = [nomdataPath, skjermingPaths].flat()
1513

1614
export const NavAnsatt = () => {
1715
const formMethods = useFormContext()
1816

19-
//TODO: Skjeming vises ikke naar bare den er valgt
2017
return (
2118
<Vis attributt={panelPaths}>
2219
<Panel

apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ const getValgteAttributter = (values) => {
131131
}
132132

133133
export const erForsteEllerTest = (values, attributter) => {
134-
console.log('attributter: ', attributter) //TODO - SLETT MEG
135134
const valgteAttributter = getValgteAttributter(values)
136-
console.log('valgteAttributter: ', valgteAttributter) //TODO - SLETT MEG
137135
return runningE2ETest() || attributter.includes(valgteAttributter[0])
138136
}
139137

0 commit comments

Comments
 (0)