Skip to content

Commit

Permalink
EY-4832: Endrer fra beloeper til beloep i frontend og dao
Browse files Browse the repository at this point in the history
  • Loading branch information
@henrikg
henrikg committed Dec 12, 2024
1 parent bde6554 commit 4232f36
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
30 changes: 15 additions & 15 deletions apps/etterlatte-behandling/src/main/kotlin/behandling/tilbakekreving/TilbakekrevingDao.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,23 +261,23 @@ class TilbakekrevingDao(

fun addArgumentsAndBatch(
maaned: YearMonth,
beloeper: Tilbakekrevingsbelop,
beloep: Tilbakekrevingsbelop,
) {
statement.setObject(1, beloeper.id)
statement.setObject(1, beloep.id)
statement.setString(2, maaned.toString())
statement.setString(3, beloeper.klasseKode)
statement.setString(4, beloeper.klasseType)
statement.setInt(5, beloeper.bruttoUtbetaling)
statement.setInt(6, beloeper.nyBruttoUtbetaling)
statement.setBigDecimal(7, beloeper.skatteprosent)
statement.setInt(8, beloeper.beregnetFeilutbetaling)
statement.setInt(9, beloeper.bruttoTilbakekreving)
statement.setInt(10, beloeper.nettoTilbakekreving)
statement.setInt(11, beloeper.skatt)
statement.setString(12, beloeper.skyld?.name)
statement.setString(13, beloeper.resultat?.name)
statement.setInt(14, beloeper.tilbakekrevingsprosent)
statement.setInt(15, beloeper.rentetillegg)
statement.setString(3, beloep.klasseKode)
statement.setString(4, beloep.klasseType)
statement.setInt(5, beloep.bruttoUtbetaling)
statement.setInt(6, beloep.nyBruttoUtbetaling)
statement.setBigDecimal(7, beloep.skatteprosent)
statement.setInt(8, beloep.beregnetFeilutbetaling)
statement.setInt(9, beloep.bruttoTilbakekreving)
statement.setInt(10, beloep.nettoTilbakekreving)
statement.setInt(11, beloep.skatt)
statement.setString(12, beloep.skyld?.name)
statement.setString(13, beloep.resultat?.name)
statement.setInt(14, beloep.tilbakekrevingsprosent)
statement.setInt(15, beloep.rentetillegg)
statement.setObject(16, tilbakekrevingBehandling.id)
statement.addBatch()
}
Expand Down
14 changes: 7 additions & 7 deletions ...ient/src/components/tilbakekreving/utbetalinger/TilbakekrevingVurderingPerioderSkjema.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,16 @@ export function TilbakekrevingVurderingPerioderSkjema({
return periode.tilbakekrevingsbeloep
.map(leggPaaOrginalIndex)
.filter(klasseTypeYtelse)
.map((beloeper) => {
const indexBeloep = beloeper.originalIndex
.map((beloep) => {
const indexBeloep = beloep.originalIndex
return (
<Table.Row key={`beloeperRad-${indexPeriode}-${indexBeloep}`} style={{ alignItems: 'start' }}>
<Table.Row key={`beloepRad-${indexPeriode}-${indexBeloep}`} style={{ alignItems: 'start' }}>
<Table.DataCell key="maaned">{formaterMaanedDato(periode.maaned)}</Table.DataCell>
<Table.DataCell key="klasseKode">
{tekstKlasseKode[beloeper.klasseKode] ?? beloeper.klasseKode}
{tekstKlasseKode[beloep.klasseKode] ?? beloep.klasseKode}
</Table.DataCell>
<Table.DataCell key="bruttoUtbetaling">{beloeper.bruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="nyBruttoUtbetaling">{beloeper.nyBruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="bruttoUtbetaling">{beloep.bruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="nyBruttoUtbetaling">{beloep.nyBruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="beregnetFeilutbetaling">
<TextField
{...register(
Expand All @@ -169,7 +169,7 @@ export function TilbakekrevingVurderingPerioderSkjema({
hideLabel={true}
/>
</Table.DataCell>
<Table.DataCell key="skatteprosent">{beloeper.skatteprosent} %</Table.DataCell>
<Table.DataCell key="skatteprosent">{beloep.skatteprosent} %</Table.DataCell>
<Table.DataCell key="bruttoTilbakekreving">
<TextField
{...register(
Expand Down
28 changes: 14 additions & 14 deletions ...ent/src/components/tilbakekreving/utbetalinger/TilbakekrevingVurderingPerioderVisning.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,24 @@ export function TilbakekrevingVurderingPerioderVisning({ behandling }: { behandl
return periode.tilbakekrevingsbeloep
.map(leggPaaOrginalIndex)
.filter(klasseTypeYtelse)
.map((beloeper) => {
.map((beloep) => {
return (
<Table.Row key={`beloeperRad-${indexPeriode}-${beloeper.originalIndex}`}>
<Table.Row key={`beloepRad-${indexPeriode}-${beloep.originalIndex}`}>
<Table.DataCell key="maaned">{formaterMaanedDato(periode.maaned)}</Table.DataCell>
<Table.DataCell key="klasse">
{tekstKlasseKode[beloeper.klasseKode] ?? beloeper.klasseKode}
{tekstKlasseKode[beloep.klasseKode] ?? beloep.klasseKode}
</Table.DataCell>
<Table.DataCell key="bruttoUtbetaling">{beloeper.bruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="nyBruttoUtbetaling">{beloeper.nyBruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="beregnetFeilutbetaling">{beloeper.beregnetFeilutbetaling} kr</Table.DataCell>
<Table.DataCell key="skatteprosent">{beloeper.skatteprosent} %</Table.DataCell>
<Table.DataCell key="bruttoTilbakekreving">{beloeper.bruttoTilbakekreving} kr</Table.DataCell>
<Table.DataCell key="nettoTilbakekreving">{beloeper.nettoTilbakekreving} kr</Table.DataCell>
<Table.DataCell key="skatt">{beloeper.skatt} kr</Table.DataCell>
<Table.DataCell key="skyld">{teksterTilbakekrevingSkyld[beloeper.skyld!!]}</Table.DataCell>
<Table.DataCell key="resultat">{teksterTilbakekrevingResultat[beloeper.resultat!!]}</Table.DataCell>
<Table.DataCell key="tilbakekrevingsprosent">{beloeper.tilbakekrevingsprosent} %</Table.DataCell>
<Table.DataCell key="rentetillegg">{beloeper.rentetillegg} kr</Table.DataCell>
<Table.DataCell key="bruttoUtbetaling">{beloep.bruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="nyBruttoUtbetaling">{beloep.nyBruttoUtbetaling} kr</Table.DataCell>
<Table.DataCell key="beregnetFeilutbetaling">{beloep.beregnetFeilutbetaling} kr</Table.DataCell>
<Table.DataCell key="skatteprosent">{beloep.skatteprosent} %</Table.DataCell>
<Table.DataCell key="bruttoTilbakekreving">{beloep.bruttoTilbakekreving} kr</Table.DataCell>
<Table.DataCell key="nettoTilbakekreving">{beloep.nettoTilbakekreving} kr</Table.DataCell>
<Table.DataCell key="skatt">{beloep.skatt} kr</Table.DataCell>
<Table.DataCell key="skyld">{teksterTilbakekrevingSkyld[beloep.skyld!!]}</Table.DataCell>
<Table.DataCell key="resultat">{teksterTilbakekrevingResultat[beloep.resultat!!]}</Table.DataCell>
<Table.DataCell key="tilbakekrevingsprosent">{beloep.tilbakekrevingsprosent} %</Table.DataCell>
<Table.DataCell key="rentetillegg">{beloep.rentetillegg} kr</Table.DataCell>
</Table.Row>
)
})
Expand Down

0 comments on commit 4232f36

Please sign in to comment.