Skip to content

Commit

Permalink
Gjort legg til ny periode mer primitiv
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreasDybdahl
AndreasDybdahl committed Feb 3, 2025
1 parent a98dd5f commit 77da63d
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 31 deletions.
39 changes: 20 additions & 19 deletions packages/ny-uttaksplan/src/components/legg-til-periode-modal/LeggTilPeriodeModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { Forelder, StønadskontoType } from '@navikt/fp-constants';
import { Planperiode } from '../../types/Planperiode';
import styles from './leggTilPeriodeModal.module.css';
import { EndreTidsperiodeModalStep } from './steps/EndreTidsperiodeModalStep';
import { OppsummeringModalStep } from './steps/OppsummeringModalStep';
import { ValgModalStep } from './steps/ValgModalStep';
// import { OppsummeringModalStep } from './steps/OppsummeringModalStep';
// import { ValgModalStep } from './steps/ValgModalStep';
import { VelgKontotypeModalStep } from './steps/VelgKontotypeModalStep';

interface Props {
Expand Down Expand Up @@ -52,15 +52,15 @@ export const LeggTilPeriodeModal = forwardRef<HTMLDialogElement, Props>(

const renderContent = () => {
switch (currentStep) {
// case 'step1':
// return (
// <ValgModalStep
// modalData={modalData}
// setModalData={setModalData}
// closeModal={closeModalWrapper}
// />
// );
case 'step1':
return (
<ValgModalStep
modalData={modalData}
setModalData={setModalData}
closeModal={closeModalWrapper}
/>
);
case 'step2':
return (
<EndreTidsperiodeModalStep
modalData={modalData}
Expand All @@ -69,23 +69,24 @@ export const LeggTilPeriodeModal = forwardRef<HTMLDialogElement, Props>(
familiehendelsedato={familiehendelsedato}
/>
);
case 'step3':
case 'step2':
return (
<VelgKontotypeModalStep
modalData={modalData}
setModalData={setModalData}
closeModal={closeModalWrapper}
/>
);
case 'step4':
return (
<OppsummeringModalStep
modalData={modalData}
setModalData={setModalData}
closeModal={closeModalWrapper}
handleAddPeriode={handleAddPeriode}
/>
);
// case 'step3':
// return (
// <OppsummeringModalStep
// modalData={modalData}
// setModalData={setModalData}
// closeModal={closeModalWrapper}
// handleAddPeriode={handleAddPeriode}
// />
// );
default:
return null;
}
Expand Down
11 changes: 6 additions & 5 deletions ...s/ny-uttaksplan/src/components/legg-til-periode-modal/steps/EndreTidsperiodeModalStep.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useIntl } from 'react-intl';
import { Button, Heading } from '@navikt/ds-react';

import { RhfDatepicker, RhfForm } from '@navikt/fp-form-hooks';
import { isBeforeOrSame, isRequired, isValidDate } from '@navikt/fp-validation';
import { isBeforeOrSame, isEmpty, isRequired, isValidDate } from '@navikt/fp-validation';

import { ModalData } from '../LeggTilPeriodeModal';

Expand Down Expand Up @@ -36,7 +36,7 @@ export const EndreTidsperiodeModalStep = ({ modalData, setModalData, closeModal,
...modalData,
fom: values.fom,
tom: values.tom,
currentStep: 'step3',
currentStep: 'step2',
});
};

Expand Down Expand Up @@ -65,6 +65,7 @@ export const EndreTidsperiodeModalStep = ({ modalData, setModalData, closeModal,
disableWeekends={true}
label="Fra og med dato"
name="fom"
defaultMonth={isEmpty(fomValue) ? familiehendelsedato : fomValue}
/>
<RhfDatepicker
showMonthAndYearDropdowns
Expand All @@ -79,7 +80,7 @@ export const EndreTidsperiodeModalStep = ({ modalData, setModalData, closeModal,
disableWeekends={true}
label="Til og med dato"
name="tom"
defaultMonth={fomValue}
defaultMonth={isEmpty(fomValue) ? familiehendelsedato : fomValue}
/>
</div>
<div
Expand All @@ -96,15 +97,15 @@ export const EndreTidsperiodeModalStep = ({ modalData, setModalData, closeModal,
</Button>
</div>
<div style={{ display: 'flex', gap: '0.5rem' }}>
<Button
{/* <Button
type="button"
variant="secondary"
onClick={() => {
setModalData({ ...modalData, currentStep: 'step1' });
}}
>
Gå tilbake
</Button>
</Button> */}
<Button>Gå videre</Button>
</div>
</div>
Expand Down
26 changes: 19 additions & 7 deletions ...ages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/VelgKontotypeModalStep.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,24 @@ import { Forelder, StønadskontoType } from '@navikt/fp-constants';
import { RhfForm, RhfRadioGroup } from '@navikt/fp-form-hooks';
import { isRequired } from '@navikt/fp-validation';

import { Planperiode } from '../../../types/Planperiode';
import { ModalData } from '../LeggTilPeriodeModal';

interface Props {
modalData: ModalData;
closeModal: () => void;
setModalData: (data: ModalData) => void;
handleAddPeriode: (oppdatertPeriode: Planperiode) => void;
}

interface FormValues {
kontoType: StønadskontoType;
forelder: Forelder;
}

export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }: Props) => {
export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData, handleAddPeriode }: Props) => {
const intl = useIntl();
const { kontoType, forelder } = modalData;
const { fom, tom, forelder, kontoType } = modalData;

const formMethods = useForm<FormValues>({
defaultValues: {
Expand All @@ -31,6 +33,9 @@ export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }:
},
});

const kontoTypeValue = formMethods.watch('kontoType');
const forelderValue = formMethods.watch('forelder');

const getForelderFromKontoType = (
kontoTypeValue: StønadskontoType,
forelderValue: Forelder | undefined,
Expand All @@ -49,13 +54,20 @@ export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }:
setModalData({
...modalData,
kontoType: values.kontoType,
currentStep: 'step4',
currentStep: 'step3',
forelder: getForelderFromKontoType(values.kontoType, values.forelder),
});
handleAddPeriode({
fom: fom!,
tom: tom!,
id: `${fom} - ${tom} - ${'kontoType'}`,
readOnly: false,
kontoType: kontoTypeValue,
forelder: forelderValue,
});
closeModal();
};

const kontoTypeValue = formMethods.watch('kontoType');

return (
<>
<RhfForm formMethods={formMethods} onSubmit={onSubmit} id="skjema">
Expand Down Expand Up @@ -99,12 +111,12 @@ export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }:
type="button"
variant="secondary"
onClick={() => {
setModalData({ ...modalData, currentStep: 'step2' });
setModalData({ ...modalData, currentStep: 'step1' });
}}
>
Gå tilbake
</Button>
<Button>Gå videre</Button>
<Button>Ferdig, legg til i planen</Button>
</div>
</div>
</RhfForm>
Expand Down
1 change: 1 addition & 0 deletions packages/validation/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export {
hasMinLength,
hasMaxLength,
hasLegalChars,
isEmpty,
} from './src/form/generalFormValidation';
export {
isValidNumberForm,
Expand Down

0 comments on commit 77da63d

Please sign in to comment.