Skip to content
This repository was archived by the owner on Sep 29, 2020. It is now read-only.

Commit 644b431

Browse files
jolarsenjolarsen
authored
TFP-249 tilby et utvalg av venteårsaker i gui (#1248)
* TFP-249 tilby et utvalg av venteårsaker i gui * NOJIRA begrens venteårsaker i send melding til bruker * NOJIRA venteårsaker i varsel om revurdering
1 parent 5f5e388 commit 644b431

File tree

5 files changed

+70
-4
lines changed

5 files changed

+70
-4
lines changed

‎packages/behandling-felles/src/components/paVent/BehandlingPaVentModal.tsx

+15-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@ const hovedKnappenType = (venteArsakHasChanged, fristHasChanged) => venteArsakHa
3636
const getPaVentText = (hasManualPaVent, frist) => (hasManualPaVent || frist
3737
? 'SettBehandlingPaVentModal.ErPaVent' : 'SettBehandlingPaVentModal.ErPaVentUtenFrist');
3838

39+
const manuelleVenteArsaker = [
40+
venteArsakType.AVV_DOK,
41+
venteArsakType.AVV_FODSEL,
42+
venteArsakType.UTV_FRIST,
43+
venteArsakType.AVV_RESPONS_REVURDERING,
44+
venteArsakType.FOR_TIDLIG_SOKNAD,
45+
venteArsakType.VENT_PÅ_SISTE_AAP_ELLER_DP_MELDEKORT,
46+
venteArsakType.ANKE_VENTER_PAA_MERKNADER_FRA_BRUKER,
47+
venteArsakType.ANKE_OVERSENDT_TIL_TRYGDERETTEN,
48+
venteArsakType.VENT_OPDT_INNTEKTSMELDING,
49+
venteArsakType.VENT_OPPTJENING_OPPLYSNINGER,
50+
];
51+
3952
interface OwnProps {
4053
cancelEvent: () => undefined;
4154
frist?: string;
@@ -115,7 +128,8 @@ export const BehandlingPaVentModal: FunctionComponent<OwnProps & WrappedComponen
115128
label={intl.formatMessage({ id: 'SettBehandlingPaVentModal.Arsak' })}
116129
placeholder={intl.formatMessage({ id: 'SettBehandlingPaVentModal.SelectPlaceholder' })}
117130
validate={[required]}
118-
selectValues={ventearsaker.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
131+
selectValues={ventearsaker.filter((va) => manuelleVenteArsaker.indexOf(va.kode) > -1)
132+
.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
119133
.map((va) => <option key={va.kode} value={va.kode}>{va.navn}</option>)}
120134
bredde="xxl"
121135
readOnly={!hasManualPaVent}

‎packages/kodeverk/src/venteArsakType.jsx

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ const venteArsakType = {
44
UTV_FRIST: 'UTV_FRIST',
55
VENT_GRADERING_UTEN_BEREGNINGSGRUNNLAG: 'VENT_GRADERING_UTEN_BEREGNINGSGRUNNLAG',
66
VENT_PÅ_TILBAKEKREVINGSGRUNNLAG: 'VENT_PÅ_TILBAKEKREVINGSGRUNNLAG',
7+
AVV_RESPONS_REVURDERING: 'AVV_RESPONS_REVURDERING',
8+
FOR_TIDLIG_SOKNAD: 'FOR_TIDLIG_SOKNAD',
9+
VENT_PÅ_SISTE_AAP_ELLER_DP_MELDEKORT: 'VENT_PÅ_SISTE_AAP_MELDEKORT',
10+
ANKE_VENTER_PAA_MERKNADER_FRA_BRUKER: 'ANKE_VENTER_PAA_MERKNADER_FRA_BRUKER',
11+
ANKE_OVERSENDT_TIL_TRYGDERETTEN: 'ANKE_OVERSENDT_TIL_TRYGDERETTEN',
12+
VENT_OPDT_INNTEKTSMELDING: 'VENT_OPDT_INNTEKTSMELDING',
13+
VENT_OPPTJENING_OPPLYSNINGER: 'VENT_OPPTJENING_OPPLYSNINGER',
714
};
815

916
export default venteArsakType;

‎packages/prosess-varsel-om-revurdering/src/components/VarselOmRevurderingPaVentModal.jsx

+16-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,24 @@ import {
1313
ariaCheck, dateAfterOrEqualToToday, hasValidDate, required,
1414
} from '@fpsak-frontend/utils';
1515

16+
import venteArsakType from '@fpsak-frontend/kodeverk/src/venteArsakType';
1617
import styles from './varselOmRevurderingPaVentModal.less';
1718

1819
const isButtonDisabled = (frist) => hasValidDate(frist) !== null || dateAfterOrEqualToToday(frist) !== null;
1920

21+
const manuelleVenteArsaker = [
22+
venteArsakType.AVV_DOK,
23+
venteArsakType.AVV_FODSEL,
24+
venteArsakType.UTV_FRIST,
25+
venteArsakType.AVV_RESPONS_REVURDERING,
26+
venteArsakType.FOR_TIDLIG_SOKNAD,
27+
venteArsakType.VENT_PÅ_SISTE_AAP_ELLER_DP_MELDEKORT,
28+
venteArsakType.ANKE_VENTER_PAA_MERKNADER_FRA_BRUKER,
29+
venteArsakType.ANKE_OVERSENDT_TIL_TRYGDERETTEN,
30+
venteArsakType.VENT_OPDT_INNTEKTSMELDING,
31+
venteArsakType.VENT_OPPTJENING_OPPLYSNINGER,
32+
];
33+
2034
/**
2135
* VarselOmRevurderingPaVentModal
2236
*
@@ -71,7 +85,8 @@ const VarselOmRevurderingPaVentModal = ({
7185
label={intl.formatMessage({ id: 'SettBehandlingPaVentModal.Arsak' })}
7286
placeholder={intl.formatMessage({ id: 'SettBehandlingPaVentModal.SelectPlaceholder' })}
7387
validate={[required]}
74-
selectValues={ventearsaker.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
88+
selectValues={ventearsaker.filter((va) => manuelleVenteArsaker.indexOf(va.kode) > -1)
89+
.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
7590
.map((ventearsak) => <option key={ventearsak.kode} value={ventearsak.kode}>{ventearsak.navn}</option>)}
7691
bredde="xxl"
7792
/>

‎packages/sak-app/src/behandlingsupport/messages/MessageBehandlingPaVentModal.tsx

+16-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { DatepickerField, SelectField } from '@fpsak-frontend/form';
1616
import { Image, VerticalSpacer } from '@fpsak-frontend/shared-components';
1717
import { KodeverkMedNavn } from '@fpsak-frontend/types';
1818

19+
import venteArsakType from '@fpsak-frontend/kodeverk/src/venteArsakType';
1920
import styles from './messageBehandlingPaVentModal.less';
2021

2122
const initFrist = () => {
@@ -32,6 +33,19 @@ const isButtonDisabled = (frist, venteArsakHasChanged, fristHasChanged) => {
3233

3334
const hovedKnappenType = (venteArsakHasChanged, fristHasChanged) => venteArsakHasChanged || fristHasChanged;
3435

36+
const manuelleVenteArsaker = [
37+
venteArsakType.AVV_DOK,
38+
venteArsakType.AVV_FODSEL,
39+
venteArsakType.UTV_FRIST,
40+
venteArsakType.AVV_RESPONS_REVURDERING,
41+
venteArsakType.FOR_TIDLIG_SOKNAD,
42+
venteArsakType.VENT_PÅ_SISTE_AAP_ELLER_DP_MELDEKORT,
43+
venteArsakType.ANKE_VENTER_PAA_MERKNADER_FRA_BRUKER,
44+
venteArsakType.ANKE_OVERSENDT_TIL_TRYGDERETTEN,
45+
venteArsakType.VENT_OPDT_INNTEKTSMELDING,
46+
venteArsakType.VENT_OPPTJENING_OPPLYSNINGER,
47+
];
48+
3549
interface OwnProps {
3650
showModal: boolean;
3751
cancelEvent: () => void;
@@ -101,7 +115,8 @@ export const MessageBehandlingPaVentModal: FunctionComponent<OwnProps & WrappedC
101115
label={intl.formatMessage({ id: 'SettBehandlingPaVentModal.Arsak' })}
102116
placeholder={intl.formatMessage({ id: 'SettBehandlingPaVentModal.SelectPlaceholder' })}
103117
validate={[required]}
104-
selectValues={ventearsaker.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
118+
selectValues={ventearsaker.filter((va) => manuelleVenteArsaker.indexOf(va.kode) > -1)
119+
.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
105120
.map((va) => <option key={va.kode} value={va.kode}>{va.navn}</option>)}
106121
bredde="xxl"
107122
/>

‎packages/sak-meny-sett-pa-vent/src/components/SettBehandlingPaVentModal.tsx

+16-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import innvilgetImageUrl from '@fpsak-frontend/assets/images/innvilget_valgt.svg
1616
import { DatepickerField, SelectField } from '@fpsak-frontend/form';
1717
import { Image, VerticalSpacer } from '@fpsak-frontend/shared-components';
1818

19+
import venteArsakType from '@fpsak-frontend/kodeverk/src/venteArsakType';
1920
import styles from './settBehandlingPaVentModal.less';
2021

2122
const initFrist = () => {
@@ -32,6 +33,19 @@ const isButtonDisabled = (frist, venteArsakHasChanged, fristHasChanged) => {
3233

3334
const hovedKnappenType = (venteArsakHasChanged, fristHasChanged) => venteArsakHasChanged || fristHasChanged;
3435

36+
const manuelleVenteArsaker = [
37+
venteArsakType.AVV_DOK,
38+
venteArsakType.AVV_FODSEL,
39+
venteArsakType.UTV_FRIST,
40+
venteArsakType.AVV_RESPONS_REVURDERING,
41+
venteArsakType.FOR_TIDLIG_SOKNAD,
42+
venteArsakType.VENT_PÅ_SISTE_AAP_ELLER_DP_MELDEKORT,
43+
venteArsakType.ANKE_VENTER_PAA_MERKNADER_FRA_BRUKER,
44+
venteArsakType.ANKE_OVERSENDT_TIL_TRYGDERETTEN,
45+
venteArsakType.VENT_OPDT_INNTEKTSMELDING,
46+
venteArsakType.VENT_OPPTJENING_OPPLYSNINGER,
47+
];
48+
3549
interface OwnProps {
3650
cancelEvent: () => void;
3751
showModal: boolean;
@@ -101,7 +115,8 @@ export const SettBehandlingPaVentModal: FunctionComponent<OwnProps & WrappedComp
101115
label={intl.formatMessage({ id: 'SettBehandlingPaVentModal.Arsak' })}
102116
placeholder={intl.formatMessage({ id: 'SettBehandlingPaVentModal.SelectPlaceholder' })}
103117
validate={[required]}
104-
selectValues={ventearsaker.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
118+
selectValues={ventearsaker.filter((va) => manuelleVenteArsaker.indexOf(va.kode) > -1)
119+
.sort((v1, v2) => v1.navn.localeCompare(v2.navn))
105120
.map((va) => <option key={va.kode} value={va.kode}>{va.navn}</option>)}
106121
bredde="xxl"
107122
/>

0 commit comments

Comments
 (0)