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.

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

Legge til storybook for inntektsgradering i uttak #6966

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ export type ArbeidsgiverOpplysninger = Readonly<{
fødselsdato?: string;
identifikator?: string;
personIdentifikator?: string;
arbeidsforholdreferanser?: {
internArbeidsforholdId?: string;
eksternArbeidsforholdId?: string;
}[];
}>;

export default ArbeidsgiverOpplysninger;
1 change: 1 addition & 0 deletions packages/prosess-uttak/src/types/GraderingMotTilsyn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ export default interface GraderingMotTilsyn {
andreSøkeresTilsyn: number;
tilgjengeligForSøker: number;
overseEtablertTilsynÅrsak?: OverseEtablertTilsynÅrsak;
andreSøkeresTilsynReberegnet?: boolean;
}
3 changes: 2 additions & 1 deletion packages/prosess-uttak/src/types/Inngangsvilkår.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ export default interface Inngangsvilkår {
K9_VK_3: Utfall;
FP_VK_21: Utfall;
FP_VK_23: Utfall;
FP_VK_34: Utfall;
FP_VK_34?: Utfall;
FP_VK_41?: Utfall;
// eslint-disable-next-line camelcase
K9_VK_2_a: Utfall;
}
30 changes: 29 additions & 1 deletion packages/prosess-uttak/src/types/Uttaksperiode.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Periode } from '@k9-sak-web/types';
import { Kilde, Periode } from '@k9-sak-web/types';
import AnnenPart from '../constants/AnnenPart';
import Utfall from '../constants/Utfall';
import Årsaker from '../constants/Årsaker';
Expand All @@ -8,9 +8,17 @@ import Inngangsvilkår from './Inngangsvilkår';
import Period from './Period';
import Utbetalingsgrad from './Utbetalingsgrad';

export enum Vurderingsresultat {
OPPFYLT = 'OPPFYLT',
IKKE_OPPFYLT = 'IKKE_OPPFYLT',
IKKE_VURDERT = 'IKKE_VURDERT',
}

export interface Uttaksperiodeelement {
utfall: Utfall;
uttaksgrad: number;
uttaksgradMedReduksjonGrunnetInntektsgradering?: number;
uttaksgradUtenReduksjonGrunnetInntektsgradering?: number;
søkerBerOmMaksimalt?: number;
årsaker: Årsaker[];
inngangsvilkår: Inngangsvilkår;
Expand All @@ -20,7 +28,10 @@ export interface Uttaksperiodeelement {
utbetalingsgrader: Utbetalingsgrad[];
graderingMotTilsyn: GraderingMotTilsyn;
annenPart: AnnenPart;
nattevåk?: UttaksperiodeBeskrivelserMedVurderinger;
beredskap?: UttaksperiodeBeskrivelserMedVurderinger;
søkersTapteArbeidstid: number;
oppgittTilsyn?: string;
pleiebehov: number;
endringsstatus?: Endringsstatus;
utenlandsoppholdUtenÅrsak?: boolean;
Expand All @@ -29,6 +40,23 @@ export interface Uttaksperiodeelement {
landkode: string;
årsak: string;
};
søkersTapteTimer?: string;
}

export interface UttaksperiodeBeskrivelserMedVurderinger {
beskrivelser: {
periode: Periode;
tekst: string;
mottattDato: string;
kilde: Kilde;
};
vurderinger: {
id: number;
periode: Periode;
begrunnelse: string;
resultat: Vurderingsresultat;
kilde: Kilde;
};
}

export interface Uttaksperiode extends Uttaksperiodeelement {
Expand Down
Loading
Loading