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.

Sign up for GitHub

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

Employer #448

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Employer #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c79c35
Update dependencies
eriksson-daniel Dec 18, 2023
eb8d886
Add info text for employers
eriksson-daniel Dec 18, 2023
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
470 changes: 231 additions & 239 deletions frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"devDependencies": {
"@types/amplitude-js": "^8.16.5",
"@types/jest": "^29.5.11",
"@types/react": "^18.2.42",
"@types/react-dom": "^18.2.17",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18",
"@types/styled-components": "^5.1.34",
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"copyfiles": "^2.4.1",
"css-loader": "^6.8.1",
"eslint": "^8.55.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prefer-arrow": "^1.2.3",
Expand All @@ -36,7 +36,7 @@
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"jest": "^29.7.0",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"style-loader": "^3.3.3",
"ts-jest": "^29.1.1",
"ts-loader": "^9.5.1",
Expand All @@ -46,25 +46,25 @@
"webpack-dev-server": "^4.15.1"
},
"dependencies": {
"@navikt/ds-css": "^5.11.4",
"@navikt/ds-css": "^5.12.0",
"@navikt/ds-icons": "^3.4.3",
"@navikt/ds-react": "^5.11.4",
"@navikt/ds-react": "^5.12.0",
"@navikt/fnrvalidator": "^1.3.3",
"@navikt/nav-dekoratoren-moduler": "^2.1.5",
"@reduxjs/toolkit": "^2.0.1",
"@sentry/react": "^7.85.0",
"@sentry/tracing": "^7.85.0",
"@sentry/react": "^7.88.0",
"@sentry/tracing": "^7.88.0",
"@styled-icons/material": "^10.47.0",
"amplitude-js": "^8.21.9",
"classnames": "^2.3.2",
"date-fns": "^2.30.0",
"dayjs": "^1.11.10",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^9.0.2",
"react-router": "^6.20.1",
"react-router-dom": "^6.20.1",
"react-redux": "^9.0.4",
"react-router": "^6.21.0",
"react-router-dom": "^6.21.0",
"redux": "^5.0.0",
"styled-components": "^6.1.1"
}
}
}
6 changes: 5 additions & 1 deletion frontend/src/components/anke/innlogget/begrunnelse/anke-begrunnelse-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button } from '@navikt/ds-react';
import { BodyLong, Button, GuidePanel } from '@navikt/ds-react';
import React, { useEffect } from 'react';
import { Link, useNavigate } from 'react-router-dom';
import { useAnkeErrors } from '@app/hooks/use-errors';
Expand Down Expand Up @@ -87,6 +87,10 @@ const RenderAnkebegrunnelsePage = ({ anke }: Props) => {
title_fragment={title_fragment}
page_title={page_title}
>
<GuidePanel>
<BodyLong>{ankeskjema.employer_info}</BodyLong>
</GuidePanel>

<PersonligeOpplysningerSummary
{...user?.navn}
f_or_d_number={user?.folkeregisteridentifikator?.identifikasjonsnummer}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/anke/uinnlogget/begrunnelse/anke-begrunnelse-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ const RenderAnkebegrunnelsePage = ({ anke }: Props) => {
title_fragment={title_fragment}
>
<GuidePanel>
<BodyLong>{ankeskjema_post.should_log_in_digital}</BodyLong>
<BodyLong spacing>{ankeskjema_post.should_log_in_digital}</BodyLong>
<BodyLong>{ankeskjema_post.employer_info}</BodyLong>
</GuidePanel>

<UserInfo klageOrAnke={anke} update={updateAnke} onError={setError} errors={errors} />
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/components/ettersendelse/ettersendelse-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GuidePanel } from '@navikt/ds-react';
import { BodyLong, BodyShort, GuidePanel } from '@navikt/ds-react';
import React, { useState } from 'react';
import { useAddress } from '@app/hooks/use-address';
import {
Expand Down Expand Up @@ -67,7 +67,7 @@ const InternalEttersendelsePage = ({ innsendingsytelse, authenticated, useErrors

const { errors, setError, isEverythingValid } = useErrors(caseData);

const { title, guide_text } = ettersendelse;
const { title, guide_text, send_by_post, employer_info_logged_in, employer_info_logged_out } = ettersendelse;

const [line1, line2, line3] = useAddress(innsendingsytelse);

Expand All @@ -76,7 +76,9 @@ const InternalEttersendelsePage = ({ innsendingsytelse, authenticated, useErrors
<FormTitleContainer tittel={title} undertittel={undertittel} />
<ContentContainer>
<GuidePanel>
{guide_text}
<BodyLong spacing>{guide_text}</BodyLong>
<BodyLong spacing>{authenticated ? employer_info_logged_in : employer_info_logged_out}</BodyLong>
<BodyShort>{send_by_post}</BodyShort>
<address>
{line1}
<br />
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/components/klage/innlogget/begrunnelse/klage-begrunnelse-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button } from '@navikt/ds-react';
import { BodyLong, Button, GuidePanel } from '@navikt/ds-react';
import React, { useEffect } from 'react';
import { Link, useNavigate } from 'react-router-dom';
import { useKlageErrors } from '@app/hooks/use-errors';
Expand Down Expand Up @@ -88,6 +88,10 @@ const RenderKlagebegrunnelsePage = ({ klage }: Props) => {
innsendingsytelse={klage.innsendingsytelse}
title_fragment={title_fragment}
>
<GuidePanel>
<BodyLong>{klageskjema.employer_info}</BodyLong>
</GuidePanel>

<PersonligeOpplysningerSummary
{...user?.navn}
f_or_d_number={user?.folkeregisteridentifikator?.identifikasjonsnummer}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/klage/uinnlogget/begrunnelse/klage-begrunnelse-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ const RenderKlagebegrunnelsePage = ({ klage }: Props) => {
title_fragment={title_fragment}
>
<GuidePanel>
<BodyLong>{klageskjema_post.should_log_in_digital}</BodyLong>
<BodyLong spacing>{klageskjema_post.should_log_in_digital}</BodyLong>
<BodyLong>{klageskjema_post.employer_info}</BodyLong>
</GuidePanel>

<UserInfo klageOrAnke={klage} update={updateKlage} onError={setError} errors={errors} />
Expand Down
24 changes: 15 additions & 9 deletions frontend/src/language/en.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,13 @@ export const en: Language = {
},
ettersendelse: {
title: 'Submit additional documentation to a complaint or appeal',
guide_text: [
<BodyShort key="1" spacing>
To submit additional documentation, first you have to print a cover page that NAV has generated for you. Put
this on top of the documentation. Follow the instructions on the cover page.
</BodyShort>,
<BodyShort key="2" spacing>
Send by post to:
</BodyShort>,
],
send_by_post: 'Send by post to:',
employer_info_logged_in:
'As an employer, you must log out and enter the national identity number or D-number of the employee to whom the additional documentation applies, print out the cover page, and sign as the employer.',
employer_info_logged_out:
'As an employer, you must enter the national identity number or D-number of the employee to whom the additional documentation applies, print out the cover page, and sign as the employer.',
guide_text:
'To submit additional documentation, first you have to print a cover page that NAV has generated for you. Put this on top of the documentation. Follow the instructions on the cover page.',
enhet: {
radio_title:
'Have you received a letter from NAV Klageinstans, or a letter from another unit within NAV that says that your case has been sent to NAV Klageinstans?',
Expand All @@ -97,6 +95,8 @@ export const en: Language = {
has_attachments_label: 'I will include attachments.',
should_log_in_digital:
'If you log in, you will be able to send the complaint and attachments digitally. You can continue without logging in, but you will have to print your complaint, sign it, and send it by post.',
employer_info:
'As an employer, you must send the complaint by post. You enter the national identity number or D-number of the employee to whom the decision applies, print out the complaint, and sign as the employer.',
innsending: {
title: 'What do you do now?',
steg: [
Expand All @@ -109,6 +109,8 @@ export const en: Language = {
},
},
klageskjema: {
employer_info:
'As an employer, you must log out and send the complaint by post. You enter the national identity number or D-number of the employee to whom the decision applies, print out the complaint, and sign as the employer.',
common: {
title_fragment: 'complain',
page_title: 'Complain against decision',
Expand Down Expand Up @@ -225,6 +227,8 @@ export const en: Language = {
has_attachments_label: 'I will include attachments.',
should_log_in_digital:
'If you log in, you will be able to send the appeal and attachments digitally. You can continue without logging in, but you will have to print your appeal, sign it, and send it by post.',
employer_info:
'As an employer, you must send the appeal by post. You enter the national identity number or D-number of the employee to whom the decision applies, print out the appeal, and sign as the employer.',
innsending: {
title: 'What do you do now?',
steg: [
Expand All @@ -237,6 +241,8 @@ export const en: Language = {
},
},
ankeskjema: {
employer_info:
'As an employer, you must log out and send the appeal by post. You enter the national identity number or D-number of the employee to whom the decision applies, print out the appeal, and sign as the employer.',
common: {
title_fragment: 'complain',
page_title: 'Complain against decision',
Expand Down
22 changes: 15 additions & 7 deletions frontend/src/language/nb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ export const nb = {
},
ettersendelse: {
title: 'Ettersende dokumentasjon på tidligere innsendt klage/anke',
guide_text: [
<BodyShort key="1" spacing>
For å kunne ettersende dokumentasjon må du først skrive ut en forside som NAV har laget for deg. Denne skal
ligge øverst. Følg oppskriften på forsiden.
</BodyShort>,
<BodyShort key="2">Send via post til:</BodyShort>,
],
send_by_post: 'Send via post til:',
employer_info_logged_out:
'Hvis du er en arbeidsgiver må legge inn fødselsnummeret eller D-nummeret til den arbeidstakeren som ettersendelsen gjelder for, skrive ut forsiden og signere som arbeidsgiver.',
employer_info_logged_in:
'Hvis du er en arbeidsgiver må du logge ut og legge inn fødselsnummeret eller D-nummeret til den arbeidstakeren som ettersendelsen gjelder for, skrive ut forsiden og signere som arbeidsgiver.',
guide_text:
'For å kunne ettersende dokumentasjon må du først skrive ut en forside som NAV har laget for deg. Denne skal ligge øverst. Følg oppskriften på forsiden.',
enhet: {
radio_title:
'Har du mottatt et brev fra NAV Klageinstans eller et brev fra en annen enhet i NAV om at saken din er sendt til NAV Klageinstans?',
Expand All @@ -97,6 +97,8 @@ export const nb = {
has_attachments_label: 'Jeg skal sende med vedlegg.',
should_log_in_digital:
'Hvis du logger deg inn kan du sende inn klagen og vedlegg digitalt her. Du kan fortsette uten å logge deg inn, men husk at du da må skrive ut klagen, signere den og sende den via post.',
employer_info:
'Som arbeidsgiver må du sende klagen i posten. Du legger inn fødselsnummeret eller D-nummeret til den arbeidstakeren som vedtaket gjelder for, skriver ut klagen og signerer som arbeidsgiver.',
innsending: {
title: 'Hva gjør du nå?',
steg: [
Expand All @@ -109,6 +111,8 @@ export const nb = {
},
},
klageskjema: {
employer_info:
'Hvis du er en arbeidsgiver må du logge ut og sende klagen i posten. Du legger inn fødselsnummeret eller D-nummeret til den arbeidstakeren som vedtaket gjelder for, skriver ut klagen og signerer som arbeidsgiver.',
common: {
title_fragment: 'klage',
page_title: 'Klage på vedtak',
Expand Down Expand Up @@ -230,6 +234,8 @@ export const nb = {
has_attachments_label: 'Jeg skal sende med vedlegg.',
should_log_in_digital:
'Hvis du logger deg inn kan du sende inn anken og vedlegg digitalt her. Du kan fortsette uten å logge deg inn, men husk at du da må skrive ut anken, signere den og sende den via post.',
employer_info:
'Som arbeidsgiver må du sende anken i posten. Du legger inn fødselsnummeret eller D-nummeret til den arbeidstakeren som vedtaket gjelder for, skriver ut anken og signerer som arbeidsgiver.',
innsending: {
title: 'Hva gjør du nå?',
steg: [
Expand All @@ -242,6 +248,8 @@ export const nb = {
},
},
ankeskjema: {
employer_info:
'Hvis du er en arbeidsgiver må du logge ut og sende anken i posten. Du legger inn fødselsnummeret eller D-nummeret til den arbeidstakeren som vedtaket gjelder for, skriver ut anken og signerer som arbeidsgiver.',
common: {
title_fragment: 'anke',
page_title: 'Anke på vedtak',
Expand Down
Loading
Loading