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

Jump to bottom

Nytt ferie steg #4631

Merged
merged 90 commits into from
Nov 18, 2024
Merged

Nytt ferie steg #4631

merged 90 commits into from
Nov 18, 2024

Commits on Aug 6, 2024

  1. Legg til nytt step

    @johannbm
    johannbm committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    b75e824 View commit details
    Browse the repository at this point in the history

  2. gjør det mulig å gå til ferie steget

    @johannbm
    johannbm committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    c01fd21 View commit details
    Browse the repository at this point in the history

  3. få layout for ferieperioder

    @johannbm
    johannbm committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d5256af View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Lagre verdier fra ferie

    @johannbm
    johannbm committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    056baeb View commit details
    Browse the repository at this point in the history

  2. legg til oppsummering

    @johannbm
    johannbm committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b105cce View commit details
    Browse the repository at this point in the history

  3. Legg til validering og maks render på 50

    @johannbm
    johannbm committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    e9c309d View commit details
    Browse the repository at this point in the history

  4. debug

    @johannbm
    johannbm committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    417e292 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Fiks sette default ja/nei hvis nei

    @johannbm
    johannbm committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    297d768 View commit details
    Browse the repository at this point in the history

  2. Fiks validering for daterange

    @johannbm
    johannbm committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    634f75e View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg 

    # Conflicts:
#	apps/svangerskapspengesoknad/src/app/appData/SvpDataContext.tsx
#	apps/svangerskapspengesoknad/src/app/intl/nb_NO.json
#	apps/svangerskapspengesoknad/src/app/intl/nn_NO.json
    @johannbm
    johannbm committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    4114b17 View commit details
    Browse the repository at this point in the history

  2. "fiks" TS feil

    @johannbm
    johannbm committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    cd88e3d View commit details
    Browse the repository at this point in the history

  3. Legg til ferie i søknaddto

    @johannbm
    johannbm committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    bba3282 View commit details
    Browse the repository at this point in the history

  4. legg til story for ferie

    @johannbm
    johannbm committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    dd4b0bd View commit details
    Browse the repository at this point in the history

  5. forenkle story

    @johannbm
    johannbm committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    d517dfc View commit details
    Browse the repository at this point in the history

  6. tekster i nb intl

    @johannbm
    johannbm committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    1a50b78 View commit details
    Browse the repository at this point in the history

  7. lagt inn tekst for NN, men ikke oversatt

    @johannbm
    johannbm committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    3fb24a8 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg 

    # Conflicts:
#	apps/svangerskapspengesoknad/src/app/steps/skjema/SkjemaSteg.stories.tsx
    @johannbm
    johannbm committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    ae1578d View commit details
    Browse the repository at this point in the history

  2. Legg inn ferie per tilrettelegging

    @johannbm
    johannbm committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    67b67b9 View commit details
    Browse the repository at this point in the history

  3. fiks feriestep når det finnes perioder

    @johannbm
    johannbm committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    82acb0f View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg

    @johannbm
    johannbm committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6e52663 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Legg til kommentar

    @johannbm
    johannbm committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    2833b49 View commit details
    Browse the repository at this point in the history

  2. oppdatert step logikk

    @johannbm
    johannbm committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    4a45345 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg 

    # Conflicts:
#	apps/foreldrepengeoversikt/vite.config.ts
#	apps/svangerskapspengesoknad/src/SvangerskapspengesøknadRoutes.tsx
#	apps/svangerskapspengesoknad/src/app-data/SvpDataContext.tsx
#	apps/svangerskapspengesoknad/src/app-data/useStepConfig.ts
#	apps/svangerskapspengesoknad/src/app/steps/egen-næring/EgenNæringStep.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/frilans/FrilansStep.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/oppsummering/Oppsummering.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/perioder/PerioderStep.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/skjema/SkjemaSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/tilrettelegging/TilretteleggingStep.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/arbeid-i-utlandet/ArbeidIUtlandet.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/arbeidsforhold-og-inntekt/ArbeidsforholdOgInntektSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/oppsummering/FerieOppsummering.tsx
#	apps/svangerskapspengesoknad/src/steps/oppsummering/Oppsummering.tsx
#	apps/svangerskapspengesoknad/src/steps/perioder/PerioderStep.tsx
#	apps/svangerskapspengesoknad/src/steps/tilrettelegging/TilretteleggingStep.tsx
#	apps/svangerskapspengesoknad/src/steps/utenlandsopphold-senere/SenereUtenlandsoppholdSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/utenlandsopphold-tidligere/TidligereUtenlandsoppholdSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/velg-arbeidsforhold/VelgArbeid.stories.tsx
#	apps/svangerskapspengesoknad/vite.config.ts
#	packages/form-hooks/src/form-wrappers/RhfTextField.tsx
    @johannbm
    johannbm committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e6e4ef7 View commit details
    Browse the repository at this point in the history

  2. Fiks imports

    @johannbm
    johannbm committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    3b05b36 View commit details
    Browse the repository at this point in the history

  3. Slett gamle stories fra merge

    @johannbm
    johannbm committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f562f0e View commit details
    Browse the repository at this point in the history

  4. Flytt nye feriestep

    @johannbm
    johannbm committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    b6ee70c View commit details
    Browse the repository at this point in the history

  5. Fjern unødig tom ferie i story context

    @johannbm
    johannbm committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e7487d8 View commit details
    Browse the repository at this point in the history

  6. unngå ternary rule

    @johannbm
    johannbm committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    ca34538 View commit details
    Browse the repository at this point in the history

  7. Fiks ferie story over på siste format

    @johannbm
    johannbm committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    0a3cea8 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. PerioderStep går nå videre til ferie

    @johannbm
    johannbm committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    86f5c70 View commit details
    Browse the repository at this point in the history

  2. Fjern tom css

    @johannbm
    johannbm committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0a2e35b View commit details
    Browse the repository at this point in the history

  3. ikke bruk index

    @johannbm
    johannbm committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    6121bb5 View commit details
    Browse the repository at this point in the history

  4. Fiks appcontainer test

    @johannbm
    johannbm committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    a69d02c View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg 

    # Conflicts:
#	apps/svangerskapspengesoknad/src/steps/oppsummering/Oppsummering.tsx
#	packages/steg-oppsummering/src/arbeidsforhold/ArbeidsforholdOppsummering.tsx
    @johannbm
    johannbm committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    0dab8d5 View commit details
    Browse the repository at this point in the history

  2. legg til ferie per arbeidsforhold

    @johannbm
    johannbm committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    dec0814 View commit details
    Browse the repository at this point in the history

  3. Fiks ny feriestruktur for flere arbeidsgivere

    @johannbm
    johannbm committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    8aadcc3 View commit details
    Browse the repository at this point in the history

  4. Fiks oppsummeringsbug for tilretteleggingsperioder når flere virksomh… 

    …eter
    @johannbm
    johannbm committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    43cd900 View commit details
    Browse the repository at this point in the history

  5. Fiks FerieOppsummering.tsx

    @johannbm
    johannbm committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    4311a4d View commit details
    Browse the repository at this point in the history

  6. Restrukturer type for avtaltFerie. Er nødvendig å eksplisitt lage rad… 

    …io button valg bla.
    @johannbm
    johannbm committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    297d53e View commit details
    Browse the repository at this point in the history

  7. Legg til kommentar

    @johannbm
    johannbm committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    3dac40b View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg

    @johannbm
    johannbm committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    041326f View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg 

    # Conflicts:
#	apps/svangerskapspengesoknad/src/app-data/getSøknadForInnsending.ts
#	apps/svangerskapspengesoknad/src/app-data/useStepConfig.ts
#	apps/svangerskapspengesoknad/src/steps/tilrettelegging/TilretteleggingStep.tsx
#	apps/svangerskapspengesoknad/src/types/Søknad.ts
    @johannbm
    johannbm committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    e50e1a1 View commit details
    Browse the repository at this point in the history

  2. oppdater nynorsk tekster

    @johannbm
    johannbm committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    da18037 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg

    @johannbm
    johannbm committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    74777a4 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg 

    # Conflicts:
#	apps/svangerskapspengesoknad/src/SvangerskapspengesøknadRoutes.tsx
#	apps/svangerskapspengesoknad/src/app-data/SvpDataContext.tsx
#	apps/svangerskapspengesoknad/src/app-data/getSøknadForInnsending.ts
#	apps/svangerskapspengesoknad/src/app-data/useStepConfig.ts
#	apps/svangerskapspengesoknad/src/steps/oppsummering/OppsummeringSteg.tsx
#	apps/svangerskapspengesoknad/src/steps/oppsummering/PerioderOppsummering.tsx
#	apps/svangerskapspengesoknad/src/steps/perioder/PerioderSteg.test.tsx
#	apps/svangerskapspengesoknad/src/steps/perioder/PerioderStep.tsx
#	apps/svangerskapspengesoknad/src/steps/tilrettelegging/TilretteleggingSteg.tsx
#	apps/svangerskapspengesoknad/src/types/Søknad.ts
    @johannbm
    johannbm committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    d65bf64 View commit details
    Browse the repository at this point in the history

  2. nærmer seg

    @johannbm
    johannbm committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    4f46bd5 View commit details
    Browse the repository at this point in the history

  3. feriestep compiles

    @johannbm
    johannbm committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    4059c27 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. wip

    @johannbm
    johannbm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    6c4f466 View commit details
    Browse the repository at this point in the history

  2. fix alle ts feil

    @johannbm
    johannbm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    556e618 View commit details
    Browse the repository at this point in the history

  3. Fiks tester

    @johannbm
    johannbm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    cac8235 View commit details
    Browse the repository at this point in the history

  4. oppdater test til å sjekke ferie

    @johannbm
    johannbm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    b9fd974 View commit details
    Browse the repository at this point in the history

  5. oppdater navigasjon

    @johannbm
    johannbm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    974f924 View commit details
    Browse the repository at this point in the history

  6. fiks stepconfig til å se på om arbeidsforhold er virksomhet

    @johannbm
    johannbm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    3959329 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. vis ferie rett i oppsummering

    @johannbm
    johannbm committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a2a6a2f View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. legg til min/max for å legge til ferie

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    97bc63e View commit details
    Browse the repository at this point in the history

  2. legg til ferie i intl

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    71ec7e3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/master' into nytt-ferie-steg

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    0f460e4 View commit details
    Browse the repository at this point in the history

  4. bruk satisfies

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    ceb1e03 View commit details
    Browse the repository at this point in the history

  5. fiks todo

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    c917114 View commit details
    Browse the repository at this point in the history

  6. fjern todo

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    5cbbf2e View commit details
    Browse the repository at this point in the history

  7. rename to feriesteg

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    3c3e597 View commit details
    Browse the repository at this point in the history

  8. fiks sjekk for privat + virksomhet

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    8f63608 View commit details
    Browse the repository at this point in the history

  9. fiks tester

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    f8a1602 View commit details
    Browse the repository at this point in the history

  10. Skriv tester

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    2547a2d View commit details
    Browse the repository at this point in the history

  11. skriv en komplisert test

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    841a860 View commit details
    Browse the repository at this point in the history

  12. fjern todos

    @johannbm
    johannbm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    f2e9ade View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg 

    # Conflicts:
#	apps/foreldrepengeoversikt/src/appData/Environment.ts
#	apps/svangerskapspengesoknad/src/Svangerskapspengesøknad.tsx
#	apps/svangerskapspengesoknad/vite.config.ts
#	packages/form-hooks/src/form-wrappers/RhfTextField.tsx
    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    1e38c2e View commit details
    Browse the repository at this point in the history

  2. fiks import fra pakker

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    d592809 View commit details
    Browse the repository at this point in the history

  3. fjern utkommentert kode

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    11b9b1e View commit details
    Browse the repository at this point in the history

  4. fiks intl for FerieOppsummering.tsx

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    3c9c9b5 View commit details
    Browse the repository at this point in the history

  5. merge feil

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    18e29d5 View commit details
    Browse the repository at this point in the history

  6. gjør dato i story dynamiske

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    9717a8d View commit details
    Browse the repository at this point in the history

  7. bytt til felles rangepicker, og legg til flere valideringer

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    65181d8 View commit details
    Browse the repository at this point in the history

  8. Revert "gjør dato i story dynamiske" 

    This reverts commit 9717a8d.
    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    e209f8d View commit details
    Browse the repository at this point in the history

  9. Fiks test

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    1be4f68 View commit details
    Browse the repository at this point in the history

  10. legg til nynorsk tester

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    ea6c671 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into nytt-ferie-steg

    @johannbm
    johannbm authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    1d77acc View commit details
    Browse the repository at this point in the history

  12. fjern ferie når arbeidsforhold velges bort

    @johannbm
    johannbm committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    e8a3290 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Merge branch 'master' into nytt-ferie-steg

    @johannbm
    johannbm authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    3af2a36 View commit details
    Browse the repository at this point in the history

  2. legg til validering på overlappende perioder

    @johannbm
    johannbm committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    a62b8a6 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. endre til å legge til perioder istedenfor input

    @johannbm
    johannbm committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    db78044 View commit details
    Browse the repository at this point in the history

  2. fiks tester

    @johannbm
    johannbm committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    1cf2934 View commit details
    Browse the repository at this point in the history

  3. skriv test for overlappende perioder

    @johannbm
    johannbm committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    1af501e View commit details
    Browse the repository at this point in the history

  4. fiks intl

    @johannbm
    johannbm committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    81cfc68 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg

    @johannbm
    johannbm committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    188d017 View commit details
    Browse the repository at this point in the history

  2. oppdater design

    @johannbm
    johannbm committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    7e2f36a View commit details
    Browse the repository at this point in the history

  3. fiks intl test

    @johannbm
    johannbm committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    e6aebf8 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Merge branch 'refs/heads/master' into nytt-ferie-steg

    @johannbm
    johannbm committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    6147cb1 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Merge branch 'master' into nytt-ferie-steg

    @johannbm
    johannbm authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    d01bd63 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. Merge branch 'master' into nytt-ferie-steg

    @johannbm
    johannbm authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    9faad4b View commit details
    Browse the repository at this point in the history