This repository has been archived by the owner on Sep 12, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
212d696
commit b0596ce
Showing
9 changed files
with
406 additions
and
154 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
62 changes: 62 additions & 0 deletions
62
src/app/søknad/arbeidstid-step/utils/__tests__/arbeidstidUtils.tests.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
import { ArbeidIPeriodeSøknadsdata, ArbeidIPeriodeType } from '../../../../types/søknadsdata/arbeidIPeriodeSøknadsdata'; | ||
import { | ||
NormalarbeidstidSøknadsdata, | ||
NormalarbeidstidType, | ||
} from '../../../../types/søknadsdata/normalarbeidstidSøknadsdata'; | ||
import { erArbeidsforholdMedFravær } from '../arbeidstidUtils'; | ||
|
||
const normalarbeidstid: NormalarbeidstidSøknadsdata = { | ||
type: NormalarbeidstidType.likeUkerOgDager, | ||
erFasteUkedager: true, | ||
erLiktHverUke: true, | ||
timerFasteUkedager: { | ||
friday: { hours: '1', minutes: '0' }, | ||
}, | ||
}; | ||
|
||
const arbeiderIkke: ArbeidIPeriodeSøknadsdata = { | ||
type: ArbeidIPeriodeType.arbeiderIkke, | ||
arbeiderIPerioden: false, | ||
}; | ||
|
||
const arbeiderVanlig: ArbeidIPeriodeSøknadsdata = { | ||
type: ArbeidIPeriodeType.arbeiderVanlig, | ||
arbeiderIPerioden: true, | ||
arbeiderRedusert: false, | ||
}; | ||
|
||
const arbeiderRedusertEnkeltdager: ArbeidIPeriodeSøknadsdata = { | ||
type: ArbeidIPeriodeType.arbeiderEnkeltdager, | ||
arbeiderIPerioden: true, | ||
arbeiderRedusert: true, | ||
enkeltdager: { '123123': { hours: '1', minutes: '0' } }, | ||
}; | ||
|
||
describe('arbeidstidUtils', () => { | ||
describe('erArbeidsforholdMedFravær', () => { | ||
it('returner true når en ikke arbeiderer i perioden', () => { | ||
expect( | ||
erArbeidsforholdMedFravær({ | ||
normalarbeidstid, | ||
arbeidISøknadsperiode: arbeiderIkke, | ||
}) | ||
).toBeTruthy(); | ||
}); | ||
it('returner true når en arbeider redusert i perioden', () => { | ||
expect( | ||
erArbeidsforholdMedFravær({ | ||
normalarbeidstid, | ||
arbeidISøknadsperiode: arbeiderRedusertEnkeltdager, | ||
}) | ||
).toBeTruthy(); | ||
}); | ||
it('returner false når en arbeider som vanlig', () => { | ||
expect( | ||
erArbeidsforholdMedFravær({ | ||
normalarbeidstid, | ||
arbeidISøknadsperiode: arbeiderVanlig, | ||
}) | ||
).toBeFalsy(); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
src/app/søknad/confirmation-dialogs/ingenFraværConfirmation.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import React from 'react'; | ||
import { Undertittel } from 'nav-frontend-typografi'; | ||
import { ConfirmationDialog } from '../../types/ConfirmationDialog'; | ||
|
||
type Props = Pick<ConfirmationDialog, 'onCancel' | 'onConfirm'>; | ||
|
||
export const getIngenFraværConfirmationDialog = (props: Props): ConfirmationDialog => ({ | ||
...props, | ||
title: 'Ingen fravær registrert', | ||
okLabel: 'Ja, det stemmer', | ||
cancelLabel: 'Nei, det stemmer ikke', | ||
content: ( | ||
<div style={{ maxWidth: '35rem' }}> | ||
<Undertittel>Fravær fra jobb</Undertittel> | ||
<p> | ||
Du har oppgitt at du jobber som normalt og ikke har fravær i perioden du søker for. For å ha rett til | ||
pleiepenger må du ha fravær fra jobb fordi du tar vare på og pleier barn. Stemmer det at du ikke har | ||
fravær fra jobb i perioden du søker for? | ||
</p> | ||
</div> | ||
), | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
export interface ConfirmationDialog { | ||
onConfirm: () => void; | ||
onCancel: () => void; | ||
title: string; | ||
content: React.ReactNode; | ||
okLabel: string; | ||
cancelLabel: string; | ||
} |