Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

La til barnetHarIkkeFnr for PP sykt barn #2294

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

La til barnetHarIkkeFnr for PP sykt barn #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/sif-ettersending/src/app/i18n/appMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ const nb = {
'step.dokumentType.annetBarn.tittel': 'Annet barn',
'step.dokumentType.annetBarn.fnr.spm': 'Barnets fødselsnummer/D-nummer',
'step.dokumentType.annetBarn.fnr.spm.description': 'Vi må vite dette for å koble dokumentet til rett sak',
'steg.dokumentType.annetBarn.fnr.barnHarIkkeFnr': 'Barnet har ikke fødselsnummer/D-nummer',
'step.dokumentType.dokumentType.ANNET': 'Annet',
'step.dokumentType.annet.info.1': 'Har vi etterspurt mer dokumentasjon fra deg?',
'step.dokumentType.annet.info.2':
Expand Down
37 changes: 30 additions & 7 deletions apps/sif-ettersending/src/app/soknad/dokument-type-step/AnnetBarnPart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { Heading } from '@navikt/ds-react';
import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block';
import { SkjemagruppeQuestion } from '@navikt/sif-common-formik-ds/src';
import { resetFieldValue, SkjemagruppeQuestion } from '@navikt/sif-common-formik-ds/src';
import { getFødselsnummerValidator } from '@navikt/sif-common-formik-ds/src/validation';
import { useAppIntl } from '../../i18n';
import { SoknadFormField } from '../../types/SoknadFormData';
import { SoknadFormData, SoknadFormField } from '../../types/SoknadFormData';
import SoknadFormComponents from '../SoknadFormComponents';
import { isDevMode } from '@navikt/sif-common-core-ds/src/utils/envUtils';
import FormBlock from '@navikt/sif-common-core-ds/src/atoms/form-block/FormBlock';
import { useFormikContext } from 'formik';

interface Props {
søkersFødselsnummer: string;
Expand All @@ -15,6 +17,11 @@ interface Props {
const AnnetBarnPart = ({ søkersFødselsnummer, harRegistrerteBarn }: Props) => {
const { text } = useAppIntl();

const {
values: { barnetHarIkkeFnr },
setFieldValue,
} = useFormikContext<SoknadFormData>();

return (
<Block margin="xl">
<SkjemagruppeQuestion
Expand All @@ -32,16 +39,32 @@ const AnnetBarnPart = ({ søkersFødselsnummer, harRegistrerteBarn }: Props) =>
!harRegistrerteBarn ? text('step.dokumentType.annetBarn.fnr.spm.description') : undefined
}
name={SoknadFormField.barnetsFødselsnummer}
validate={getFødselsnummerValidator({
required: true,
allowHnr: isDevMode,
disallowedValues: [søkersFødselsnummer],
})}
validate={
!barnetHarIkkeFnr
? getFødselsnummerValidator({
required: true,
allowHnr: isDevMode,
disallowedValues: [søkersFødselsnummer],
})
: undefined
}
width="xl"
type="tel"
maxLength={11}
disabled={barnetHarIkkeFnr}
/>
</div>
<FormBlock margin="l">
<SoknadFormComponents.Checkbox
label={text('steg.dokumentType.annetBarn.fnr.barnHarIkkeFnr')}
name={SoknadFormField.barnetHarIkkeFnr}
afterOnChange={(newValue) => {
if (newValue) {
resetFieldValue(SoknadFormField.barnetsFødselsnummer, setFieldValue, '');
}
}}
/>
</FormBlock>
</SkjemagruppeQuestion>
</Block>
);
Expand Down
2 changes: 2 additions & 0 deletions apps/sif-ettersending/src/app/types/SoknadFormData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export enum SoknadFormField {
valgteRegistrertBarn = 'valgteRegistrertBarn',
gjelderEtAnnetBarn = 'gjelderEtAnnetBarn',
barnetsFødselsnummer = 'barnetsFødselsnummer',
barnetHarIkkeFnr = 'barnetHarIkkeFnr',
beskrivelse = 'beskrivelse',
ytelse = 'ytelse',
dokumenter = 'dokumenter',
Expand All @@ -29,6 +30,7 @@ export interface SoknadFormData {
[SoknadFormField.valgteRegistrertBarn]?: RegistrertBarnFormData;
[SoknadFormField.gjelderEtAnnetBarn]?: boolean;
[SoknadFormField.barnetsFødselsnummer]?: string;
[SoknadFormField.barnetHarIkkeFnr]?: boolean;
[SoknadFormField.beskrivelse]?: string;
[SoknadFormField.ytelse]?: YtelseKey;
[SoknadFormField.dokumenter]: Attachment[];
Expand Down