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.

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

Ung: Aksjonspunkt arbeid og inntekt #7240

Merged
merged 16 commits into from
Mar 31, 2025
Merged

Ung: Aksjonspunkt arbeid og inntekt #7240

merged 16 commits into from
Mar 31, 2025

Conversation

hallvardastark
Copy link
Collaborator

@hallvardastark hallvardastark commented Mar 20, 2025

Løsning

Kan håndtere aksjonspunkt 8000.

Andre endringer

Fjernet bruk av tailwind i dette panelet

Skjermbilder

Skjermbilde 2025-03-29 kl  14 54 43
Skjermbilde 2025-03-29 kl  14 54 50
Skjermbilde 2025-03-29 kl  14 54 47

Bort med bruk av tailwind
@hallvardastark hallvardastark changed the title Påbegynt aksjonspunkt Ung: Påbegynt aksjonspunkt arbeid og inntekt Mar 20, 2025
@hallvardastark hallvardastark changed the title Ung: Påbegynt aksjonspunkt arbeid og inntekt Ung: Aksjonspunkt arbeid og inntekt Mar 29, 2025
@hallvardastark hallvardastark requested a review from Copilot March 29, 2025 13:25
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This pull request aims to remove Tailwind usage from the Ung-beregning module and replace it with CSS modules while introducing adjustments to aksjonspunkt handling and submission callbacks.

  • Converted inline Tailwind classes to CSS module classes and updated styling in several UI components.
  • Introduced new props such as submitCallback and aksjonspunkter to support aksjonspunkt functionality.
  • Updated query hooks and component layouts to align with the new design approach.

Reviewed Changes

Copilot reviewed 20 out of 25 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
dagsatsOgUtbetaling.module.d.css.ts New CSS module for DagsatsOgUtbetaling styles.
barn.module.d.css.ts New CSS module for BarnPanel styling.
arbeidOgInntekt.module.d.css.ts New CSS module for ArbeidOgInntekt styling.
UngBeregningIndex.tsx Updated component props to include submitCallback and aksjonspunkter.
UngBeregningBackendClient.ts & UngBeregningBackendApiType.ts Added new API method to fetch kontroll inntekt data.
UngBeregning.tsx Adjusted component logic to handle new API data and aksjonspunkt logic, plus layout adjustments.
UngBeregning.stories.tsx Updated stories to pass new callback prop.
UngBarnFakta.tsx Removed unused component in favor of BarnPanel.
DataSection.tsx, DagsatsOgUtbetaling.tsx & BarnPanel.tsx Updated layout and styling to use CSS modules instead of Tailwind classes.
ArbeidOgInntekt.tsx Major refactoring to include form handling for manual income adjustment and aksjonspunkt rendering.
AksjonspunktCodes.ts & BeregningProsessStegPanelDef.tsx Updated aksjonspunkt codes integration in backend and panel definitions.
Files not reviewed (5)
  • packages/v2/backend/package.json: Language not supported
  • packages/v2/gui/src/prosess/ung-beregning/arbeidOgInntekt.module.css: Language not supported
  • packages/v2/gui/src/prosess/ung-beregning/barn.module.css: Language not supported
  • packages/v2/gui/src/prosess/ung-beregning/dagsatsOgUtbetaling.module.css: Language not supported
  • packages/v2/gui/src/prosess/ung-beregning/dataSection.module.css: Language not supported

@hallvardastark hallvardastark marked this pull request as ready for review March 29, 2025 13:52
@hallvardastark hallvardastark requested a review from a team as a code owner March 29, 2025 13:52
</Heading>
<Box maxWidth="75ch">
<BodyLong size="small">
Jeg fikk forskuttert litt lønn av arbeidsgiver denne måneden fordi jeg har hatt økonomiske
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Foreløpig hardkodet

<PersonIcon title="Deltager" fontSize="1.5rem" className={styles.personIcon} />
<VStack gap="2">
<Heading size="xsmall" as="h3">
Beskrivelse fra deltaker for avvik i perioden 01.02.2025 - 28.02.2025
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Foreløpig hardkodet

@hallvardastark hallvardastark enabled auto-merge (squash) March 29, 2025 13:56
@hallvardastark hallvardastark merged commit 0c54f82 into master Mar 31, 2025
5 checks passed
@hallvardastark hallvardastark deleted the arbeid-inntekt-ap branch March 31, 2025 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants