Skip to content

Commit

Permalink
Tilpasser regel-id
Browse files Browse the repository at this point in the history
  • Loading branch information
@espenjv
espenjv committed Sep 20, 2023
1 parent ef0236e commit 5efca60
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion ...lag/grenseverdi/AvkortBGAndelerSomIkkeGjelderArbeidsforholdAndelsmessigUtenFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

@RuleDocumentation(AvkortBGAndelerSomIkkeGjelderArbeidsforholdAndelsmessigUtenFordeling.ID)
public class AvkortBGAndelerSomIkkeGjelderArbeidsforholdAndelsmessigUtenFordeling extends LeafSpecification<BeregningsgrunnlagPeriode> {
public static final String ID = "FP_BR 29.8.4";
public static final String ID = "FP_BR 29.8.4_uten_fordeling";
public static final String BESKRIVELSE = "Avkort alle beregningsgrunnlagsandeler som ikke gjelder arbeidsforhold andelsmessig.";

AvkortBGAndelerSomIkkeGjelderArbeidsforholdAndelsmessigUtenFordeling() {
Expand Down
2 changes: 1 addition & 1 deletion ...rygdloven/beregningsgrunnlag/grenseverdi/FastsettAndelForArbeidsforholdUtenFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

@RuleDocumentation(FastsettAndelForArbeidsforholdUtenFordeling.ID)
class FastsettAndelForArbeidsforholdUtenFordeling extends LeafSpecification<BeregningsgrunnlagPeriode> {
static final String ID = "FP_BR 29.8.6";
static final String ID = "FP_BR 29.8.6_uten_fordeling";
static final String BESKRIVELSE = "Fastsett andeleler pr Arbeidsforhold";

FastsettAndelForArbeidsforholdUtenFordeling() {
Expand Down
2 changes: 1 addition & 1 deletion ...sgrunnlag/grenseverdi/FastsettAndelForBGAndelerSomGjelderArbeidsforholdUtenFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

@RuleDocumentation(FastsettAndelForBGAndelerSomGjelderArbeidsforholdUtenFordeling.ID)
class FastsettAndelForBGAndelerSomGjelderArbeidsforholdUtenFordeling extends LeafSpecification<BeregningsgrunnlagPeriode> {
static final String ID = "FP_BR 29.8.10";
static final String ID = "FP_BR 29.8.10_uten_fordeling";
static final String BESKRIVELSE = "Fastsett brukers andel for alle beregningsgrunnlagsandeler som gjelder arbeidsforhold.";

FastsettAndelForBGAndelerSomGjelderArbeidsforholdUtenFordeling() {
Expand Down
2 changes: 1 addition & 1 deletion .../java/no/nav/folketrygdloven/beregningsgrunnlag/grenseverdi/FastsettAndelLikBruttoBG.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@RuleDocumentation(FastsettAndelLikBruttoBG.ID)
public class FastsettAndelLikBruttoBG extends LeafSpecification<BeregningsgrunnlagPeriode> {

static final String ID = "FP_BR 29.6.2";
static final String ID = "FP_BR 29.6.2_med_fordeling";
static final String BESKRIVELSE = "Fastsett andel lik brutto bg";

public FastsettAndelLikBruttoBG() {
Expand Down
2 changes: 1 addition & 1 deletion ...folketrygdloven/beregningsgrunnlag/grenseverdi/FastsettAndelLikBruttoBGUtenFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@RuleDocumentation(FastsettAndelLikBruttoBGUtenFordeling.ID)
public class FastsettAndelLikBruttoBGUtenFordeling extends LeafSpecification<BeregningsgrunnlagPeriode> {

static final String ID = "FP_BR 29.6.2";
static final String ID = "FP_BR 29.6.2_uten_fordeling";
static final String BESKRIVELSE = "Fastsett andel lik brutto bg";

public FastsettAndelLikBruttoBGUtenFordeling() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/no/nav/folketrygdloven/beregningsgrunnlag/grenseverdi/FinnGrenseverdi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@RuleDocumentation(FinnGrenseverdi.ID)
public class FinnGrenseverdi extends LeafSpecification<BeregningsgrunnlagPeriode> {

public static final String ID = "FP_BR 6.2";
public static final String ID = "FP_BR 6.2_med_fordeling";
public static final String BESKRIVELSE = "Finn grenseverdi";

public FinnGrenseverdi() {
Expand Down
4 changes: 2 additions & 2 deletions ...a/no/nav/folketrygdloven/beregningsgrunnlag/grenseverdi/FinnGrenseverdiUtenFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
@RuleDocumentation(FinnGrenseverdiUtenFordeling.ID)
public class FinnGrenseverdiUtenFordeling extends LeafSpecification<BeregningsgrunnlagPeriode> {

public static final String ID = "FP_BR 6.2";
public static final String BESKRIVELSE = "Finn grenseverdi";
public static final String ID = "FP_BR 6.2_uten_fordeling";
public static final String BESKRIVELSE = "Finn grenseverdi uten fordeling";

public FinnGrenseverdiUtenFordeling() {
super(ID, BESKRIVELSE);
Expand Down
2 changes: 1 addition & 1 deletion ...ava/no/nav/folketrygdloven/beregningsgrunnlag/grenseverdi/RegelFastsettAndelBGOver6G.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import no.nav.fpsak.nare.specification.Specification;

public class RegelFastsettAndelBGOver6G implements RuleService<BeregningsgrunnlagPeriode> {
public static final String ID = "FP_BR_29.8";
public static final String ID = "FP_BR_29.8_med_fordeling";
public static final String BESKRIVELSE = "Fastsett avkortet BG over 6G når refusjon under 6G";
private BeregningsgrunnlagPeriode regelmodell;

Expand Down
2 changes: 1 addition & 1 deletion ...lketrygdloven/beregningsgrunnlag/grenseverdi/RegelFastsettAndelBGOver6GUtenFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import no.nav.fpsak.nare.specification.Specification;

public class RegelFastsettAndelBGOver6GUtenFordeling implements RuleService<BeregningsgrunnlagPeriode> {
public static final String ID = "FP_BR_29.8";
public static final String ID = "FP_BR_29.8_uten_fordeling";
public static final String BESKRIVELSE = "Fastsett avkortet BG over 6G når refusjon under 6G";
private BeregningsgrunnlagPeriode regelmodell;

Expand Down
2 changes: 1 addition & 1 deletion .../nav/folketrygdloven/beregningsgrunnlag/grenseverdi/RegelFinnGrenseverdiMedFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Specification<BeregningsgrunnlagPeriode> getSpecification() {

// Fastsett uten avkorting
Specification<BeregningsgrunnlagPeriode> fastsettUtenAvkorting = rs.beregningsRegel(
"FP_BR_29.6",
"FP_BR_29.6_med_fordeling",
"Fastsett BG uten avkorting",
new FastsettAndelLikBruttoBG(),
fastsettGrenseverdi);
Expand Down
2 changes: 1 addition & 1 deletion ...nav/folketrygdloven/beregningsgrunnlag/grenseverdi/RegelFinnGrenseverdiUtenFordeling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Specification<BeregningsgrunnlagPeriode> getSpecification() {

// Fastsett uten avkorting
Specification<BeregningsgrunnlagPeriode> fastsettUtenAvkorting = rs.beregningsRegel(
"FP_BR_29.6",
"FP_BR_29.6_uten_fordeling",
"Fastsett BG uten avkorting",
new FastsettAndelLikBruttoBGUtenFordeling(),
fastsettGrenseverdi);
Expand Down

0 comments on commit 5efca60

Please sign in to comment.