Skip to content

Commit

Permalink
Merge pull request #42 from navikt/1.0.15
Browse files Browse the repository at this point in the history
Nye Enum-koder for FormelKode, Grunnlagkilde, Inntekttype, SakType og…
  • Loading branch information
ehellerslien authored Oct 7, 2024
2 parents 302f125 + 45e6f87 commit 284eaa5
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>no.nav.pensjon.regler</groupId>
<artifactId>pensjon-regler-api</artifactId>
<version>1.0.14</version>
<version>1.0.15</version>
<packaging>jar</packaging>
<name>NAV :: Pensjon-Regler API</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,18 @@ enum class FormelKodeEnum {
UTSKO8,
MyEksportforbud,
AP_GJT1,
AP_GJT2;
AP_GJT2,

/**
* Nye fra PEN.
*/
LivsvD3,
LivsvD4,
MPNUttakFullTT,
GAPx,
GAR_PEN_Bx,
GAR_T_Bx,
GATx,
PEN_Bx

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,13 @@ enum class GrunnlagkildeEnum {
OVRIG,
INNT_KONV,
IK,
PROSESS;
PROSESS,

/**
* Fra PEN
*/
MPNOMR,
REGULERING,
BA,
OMSORGSOPPTJENING
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,11 @@ enum class InntekttypeEnum {
RAP_ARB,
RAP_NAR,
RAP_AND,
UT_BT;
UT_BT,

P_BI_x_KAP,
P_BI_x_LIGN,
P_BI_x_LTR,
P_PE_x_PGILT,
P_PE_x_SILT,
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ enum class SakTypeEnum {
UFOREP,
GENRL,
GRBL,
GAM_YRK
GAM_YRK,
AFP,
AFP_PRIVAT;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.pensjon.regler.domain.enum

// TODO Denne er ny, tatt fra Pesys. Vurder å ta inn i pensjon-regler
enum class SimuleringTypeEnum {
/**
* AFP
Expand Down

0 comments on commit 284eaa5

Please sign in to comment.