From 36fc8b597cb055a2bec2633e39a2df6b340c5904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Schr=C3=B8der?= Date: Mon, 11 Dec 2023 14:01:37 +0100 Subject: [PATCH] Legger til ukjent forelder i brev (#120) * Legger til ukjent forelder i brev * Legg til opphold utland i brev --- .../data/eypdfgen/barnepensjon_v2.json | 27 +++++++++++++++++ .../templates/eypdfgen/barnepensjon_v2.hbs | 1 + .../barnepensjon/oppholdUtland.hbs | 25 ++++++++++++++++ .../barnepensjon/opplysningerOmBarnet.hbs | 4 +++ .../opplysningerOmUkjentForelder.hbs | 14 +++++++++ .../partials_v2/common/enkelOpplysning.hbs | 6 ++++ .../common/personalia/enkelPersonalia.hbs | 29 ++----------------- 7 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/oppholdUtland.hbs create mode 100644 apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmUkjentForelder.hbs create mode 100644 apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/enkelOpplysning.hbs diff --git a/apps/ey-pdfgen/data/eypdfgen/barnepensjon_v2.json b/apps/ey-pdfgen/data/eypdfgen/barnepensjon_v2.json index 5ab565f0a..ee74ad3f9 100644 --- a/apps/ey-pdfgen/data/eypdfgen/barnepensjon_v2.json +++ b/apps/ey-pdfgen/data/eypdfgen/barnepensjon_v2.json @@ -70,6 +70,33 @@ "spoersmaal": "Statsborgerskap", "svar": "Norge" }, + "bosattNorge" : { + "spoersmaal": "Have you lived or stayed abroad in the last 12 months?", + "svar": { + "innhold": "Yes", + "verdi": "JA" + }, + "opplysning": { + "oppholdLand": { + "spoersmaal": "State which country", + "svar": { + "innhold": "Grønland" + } + }, + "oppholdFra": { + "spoersmaal": "From date", + "svar": { + "innhold": "2023-01-01" + } + }, + "oppholdTil": { + "spoersmaal": "To date", + "svar": { + "innhold": "2023-01-02" + } + } + } + }, "utenlandsAdresse": { "spoersmaal": "Bor barnet i et annet land enn Norge?", "svar": { diff --git a/apps/ey-pdfgen/templates/eypdfgen/barnepensjon_v2.hbs b/apps/ey-pdfgen/templates/eypdfgen/barnepensjon_v2.hbs index c4e869ba3..f535249a9 100644 --- a/apps/ey-pdfgen/templates/eypdfgen/barnepensjon_v2.hbs +++ b/apps/ey-pdfgen/templates/eypdfgen/barnepensjon_v2.hbs @@ -24,6 +24,7 @@ {{> eypdfgen/partials_v2/common/utbetalingsinformasjon/utbetalingsinformasjon this.utbetalingsInformasjon}} {{> eypdfgen/partials_v2/barnepensjon/opplysningerOmBarnet this.soeker}} {{> eypdfgen/partials_v2/barnepensjon/opplysningerOmForeldre this.foreldre}} + {{> eypdfgen/partials_v2/barnepensjon/opplysningerOmUkjentForelder this.soeker.ukjentForelder}} {{> eypdfgen/partials_v2/barnepensjon/opplysningerOmSoesken this.soesken}} diff --git a/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/oppholdUtland.hbs b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/oppholdUtland.hbs new file mode 100644 index 000000000..33c1d349a --- /dev/null +++ b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/oppholdUtland.hbs @@ -0,0 +1,25 @@ +

+ {{#eq spraak "en"}} + Stays abroad + {{else}} + {{#eq spraak "nn"}} + Opphald utland + {{else}} + Opphold utland + {{/eq}} + {{/eq}} +

+ +{{> eypdfgen/partials_v2/common/opplysning this}} + +{{#eq this.svar.verdi "JA"}} + {{> eypdfgen/partials_v2/common/opplysning this.opplysning.oppholdLand}} + + {{#if this.opplysning.oppholdFra}} + {{> eypdfgen/partials_v2/common/datoOpplysning this.opplysning.oppholdFra}} + {{/if}} + + {{#if this.opplysning.oppholdTil}} + {{> eypdfgen/partials_v2/common/datoOpplysning this.opplysning.oppholdTil}} + {{/if}} +{{/eq}} diff --git a/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmBarnet.hbs b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmBarnet.hbs index d0d8ff1c1..634bf70a6 100644 --- a/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmBarnet.hbs +++ b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmBarnet.hbs @@ -11,3 +11,7 @@ {{> eypdfgen/partials_v2/common/barn/barn this}} + +{{#if this.bosattNorge}} + {{> eypdfgen/partials_v2/barnepensjon/oppholdUtland this.bosattNorge}} +{{/if}} diff --git a/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmUkjentForelder.hbs b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmUkjentForelder.hbs new file mode 100644 index 000000000..1ad72ba0a --- /dev/null +++ b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/barnepensjon/opplysningerOmUkjentForelder.hbs @@ -0,0 +1,14 @@ +{{#if this}} +

+ {{#eq spraak "en"}} + Unknown parent + {{else}} + {{#eq spraak "nn"}} + Ukjent forelder + {{else}} + Ukjent forelder + {{/eq}} + {{/eq}} +

+ {{> eypdfgen/partials_v2/common/enkelOpplysning this}} +{{/if}} \ No newline at end of file diff --git a/apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/enkelOpplysning.hbs b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/enkelOpplysning.hbs new file mode 100644 index 000000000..ec95277fc --- /dev/null +++ b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/enkelOpplysning.hbs @@ -0,0 +1,6 @@ +{{#if this }} +
+
{{this.spoersmaal}}
+
{{this.svar}}
+
+{{/if}} diff --git a/apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/personalia/enkelPersonalia.hbs b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/personalia/enkelPersonalia.hbs index f5e4ceb1c..3d845f509 100644 --- a/apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/personalia/enkelPersonalia.hbs +++ b/apps/ey-pdfgen/templates/eypdfgen/partials_v2/common/personalia/enkelPersonalia.hbs @@ -1,26 +1,3 @@ -
-
- {{this.fornavn.spoersmaal}} -
-
- {{this.fornavn.svar}} -
-
- -
-
- {{this.etternavn.spoersmaal}} -
-
- {{this.etternavn.svar}} -
-
- -
-
- {{this.foedselsnummer.spoersmaal}} -
-
- {{this.foedselsnummer.svar}} -
-
+{{> eypdfgen/partials_v2/common/enkelOpplysning this.fornavn}} +{{> eypdfgen/partials_v2/common/enkelOpplysning this.etternavn}} +{{> eypdfgen/partials_v2/common/enkelOpplysning this.foedselsnummer}}