Feature/popp gjennomsnitt g #3582
Merged
Conversation
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
…enne direkte til frontend #deploy-test-frontend
…snittlig G-verdi #deploy-test-frontend
…snittlig G-verdi #deploy-test-frontend
…enerert pensjon-inntekt og lagt på validering og BestillingKriterieMapping #deploy-test-frontend
#deploy-test-frontend
#deploy-test-frontend
#deploy-test-dolly-backend
#deploy-test-dolly-backend
#deploy-test-frontend
…navigering frem og tilbake i bestillingen #deploy-test-frontend
# Conflicts: # apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumer.java # apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/pensjon/PensjonData.java # apps/dolly-frontend/src/main/js/package-lock.json # apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx # apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx # apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx
#deploy-test-dolly-backend
#deploy-test-frontend
#deploy-test-frontend
krharum
approved these changes
Aug 15, 2024
betsytraran
approved these changes
Aug 15, 2024
There was a problem hiding this comment.
Roser er røde, fioler er blå,
jeg klarer ikke kverke koden din mer, så jeg godkjenner nå 🌹
(Liten ting bare, som nevnt i går hadde det vært veldig fint med noe info om man risikerer at bestillingen feiler pga alder. Regner med at du bare kan bruke det samme som på "Fyll inn inntekt", så bør være en grei sak 😎 )
#deploy-test-frontend
# Conflicts: # apps/dolly-frontend/src/main/js/src/pages/adminPages/Appstyring/EditParameter.tsx
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.