-
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.
SVP: Forenkling av tilrettelegging (#2730)
- Loading branch information
1 parent
a6298b6
commit e5199ae
Showing
57 changed files
with
544 additions
and
660 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
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
129 changes: 88 additions & 41 deletions
129
domene/src/test/resources/json/svangerskapspengesøknad.json
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 |
|---|---|---|
| @@ -1,48 +1,95 @@ | ||
| { | ||
| "barn": { | ||
| "erBarnetFødt": false, | ||
| "termindato": "2021-12-30T00:00:00.000Z" | ||
| "språkkode": "nb", | ||
| "barn": | ||
| { | ||
| "erBarnetFødt": true, | ||
| "termindato": "2024-10-17", | ||
| "fødselsdato": "2024-09-01" | ||
| }, | ||
| "frilans": | ||
| { | ||
| "oppstart": "2024-09-01", | ||
| "jobberFremdelesSomFrilans": true | ||
| }, | ||
| "utenlandsopphold": | ||
| [ | ||
| { | ||
| "fom": "2024-11-01", | ||
| "tom": "2025-01-01", | ||
| "landkode": "PF" | ||
| } | ||
| ], | ||
| "tilrettelegging": | ||
| [ | ||
| { | ||
| "type": "ingen", | ||
| "slutteArbeidFom": "2024-08-21", | ||
| "arbeidsforhold": | ||
| { | ||
| "id": "896929119", | ||
| "type": "virksomhet" | ||
| }, | ||
| "behovForTilretteleggingFom": "2024-08-01" | ||
| }, | ||
| "erEndringssøknad": false, | ||
| "informasjonOmUtenlandsopphold": { | ||
| "iNorgeNeste12Mnd": true, | ||
| "iNorgePåHendelsestidspunktet": true, | ||
| "iNorgeSiste12Mnd": true, | ||
| "jobbetINorgeSiste12Mnd": true, | ||
| "senereOpphold": [], | ||
| "tidligereOpphold": [] | ||
| }, | ||
| "søker": { | ||
| "harHattAnnenInntektSiste10Mnd": false, | ||
| "harJobbetSomFrilansSiste10Mnd": false, | ||
| "harJobbetSomSelvstendigNæringsdrivendeSiste10Mnd": false, | ||
| "rolle": "mor", | ||
| "språkkode": "NB" | ||
| }, | ||
| "tilrettelegging": [ | ||
| { | ||
| "type": "delvis", | ||
| "tilrettelagtArbeidFom": "2024-09-01", | ||
| "arbeidsforhold": | ||
| { | ||
| "type": "frilanser", | ||
| "risikoFaktorer": "aosudhsadasd", | ||
| "tilretteleggingstiltak": "dasdasdasda" | ||
| }, | ||
| "behovForTilretteleggingFom": "2024-09-01", | ||
| "stillingsprosent": 55 | ||
| } | ||
| ], | ||
| "vedlegg": | ||
| [ | ||
| { | ||
| "id": "V202501420381149434121431755494217436", | ||
| "file": | ||
| {}, | ||
| "filename": "Energiattest-2024-22241-20240909-Christophers-vei12-0301-53-305-0-80152663.pdf", | ||
| "filesize": 671019, | ||
| "uploaded": true, | ||
| "pending": false, | ||
| "type": "tilrettelegging", | ||
| "skjemanummer": "I000109", | ||
| "url": "https://www.intern.dev.nav.no/rest/storage/svangerskapspenger/vedlegg/bbcc8a26-9d47-45c3-bd7b-581473a6523c", | ||
| "uuid": "bbcc8a26-9d47-45c3-bd7b-581473a6523c", | ||
| "dokumenterer": | ||
| { | ||
| "type": "TILRETTELEGGING", | ||
| "arbeidsforhold": | ||
| { | ||
| "arbeidsforhold": { | ||
| "id": "342352362", | ||
| "type": "virksomhet" | ||
| }, | ||
| "behovForTilretteleggingFom": "2021-12-01T00:00:00.000Z", | ||
| "stillingsprosent": 50, | ||
| "tilrettelagtArbeidFom": "2021-12-02T00:00:00.000Z", | ||
| "type": "delvis" | ||
| "id": "896929119", | ||
| "type": "virksomhet" | ||
| } | ||
| ], | ||
| "type": "svangerskapspenger", | ||
| "vedlegg": [ | ||
| } | ||
| }, | ||
| { | ||
| "id": "V7820120548515963636185978031654819", | ||
| "file": | ||
| {}, | ||
| "filename": "Christmas-is-coming.jpg", | ||
| "filesize": 76305, | ||
| "uploaded": true, | ||
| "pending": false, | ||
| "type": "tilrettelegging", | ||
| "skjemanummer": "I000109", | ||
| "url": "https://www.intern.dev.nav.no/rest/storage/svangerskapspenger/vedlegg/f0327564-adc9-47c6-9621-341d4c43d99e", | ||
| "uuid": "f0327564-adc9-47c6-9621-341d4c43d99e", | ||
| "dokumenterer": | ||
| { | ||
| "type": "TILRETTELEGGING", | ||
| "arbeidsforhold": | ||
| { | ||
| "skjemanummer": "I000109", | ||
| "uuid": "733de40c-1c57-4cbc-933f-dcd43ba8548b", | ||
| "dokumenterer": { | ||
| "type": "tilrettelegging", | ||
| "arbeidsforhold": { | ||
| "id": "342352362", | ||
| "type": "virksomhet" | ||
| } | ||
| } | ||
| "type": "frilanser", | ||
| "risikoFaktorer": "aosudhsadasd", | ||
| "tilretteleggingstiltak": "dasdasdasda" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } |
2 changes: 2 additions & 0 deletions
2
...src/main/java/no/nav/foreldrepenger/selvbetjening/kontrakt/innsending/dto/Innsending.java
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
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
38 changes: 0 additions & 38 deletions
38
.../selvbetjening/kontrakt/innsending/dto/svangerskapspenger/SvangerskapspengesøknadDto.java
This file was deleted.
Oops, something went wrong.
21 changes: 0 additions & 21 deletions
21
...repenger/selvbetjening/kontrakt/innsending/dto/svangerskapspenger/TilretteleggingDto.java
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.