Skip to content

Commit

Permalink
Fikser bug i summeringsmetode (#430)
Browse files Browse the repository at this point in the history
  • Loading branch information
espenjv authored Sep 12, 2023
1 parent 64b21ed commit c822235
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</developers>

<properties>
<revision>3.2</revision>
<revision>4.1</revision>
<sha1></sha1>
<changelist>-SNAPSHOT</changelist>
<java.version>17</java.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private BigDecimal finnAktivitetsgradert(BigDecimal verdi) {

public BigDecimal getAktivitetsgradertBruttoInkludertNaturalytelsePrÅr() {
return bruttoPrÅr != null ? finnAktivitetsgradert(getBruttoInkludertNaturalytelsePrÅr()) : getArbeidsforhold().stream()
.map(BeregningsgrunnlagPrArbeidsforhold::getGradertBruttoInkludertNaturalytelsePrÅr)
.map(BeregningsgrunnlagPrArbeidsforhold::getAktivitetsgradertBruttoInkludertNaturalytelsePrÅr)
.filter(Optional::isPresent)
.map(Optional::get)
.reduce(BigDecimal.ZERO, BigDecimal::add);
Expand Down

0 comments on commit c822235

Please sign in to comment.