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

Lagt til riktig innsats behov for VTAO #1265

Merged
merged 1 commit into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public boolean isSommerjobb() {
return this == Tiltakstype.SOMMERJOBB;
}

public boolean isVTAO() { return this == Tiltakstype.VTAO; }

public boolean skalBesluttes() {
return this == Tiltakstype.SOMMERJOBB ||
this == Tiltakstype.VARIG_LONNSTILSKUDD ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ public boolean isKvalifisererTilVariglonnstilskudd() {
return this == VARIG_TILPASSET_INNSATS;
}

public boolean isKvalifisererTilVTAO(){
return this == VARIG_TILPASSET_INNSATS;
}

public Integer finnLonntilskuddProsentsatsUtifraKvalifiseringsgruppe(Integer prosentsatsLiten, Integer prosentsatsStor) {
return switch (this) {
case SPESIELT_TILPASSET_INNSATS, VARIG_TILPASSET_INNSATS -> prosentsatsStor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ public VeilarboppfolgingService(VeilarboppfolgingClient client) {
throw new FeilkodeException(Feilkode.KVALIFISERINGSGRUPPE_VARIG_LONNTILSKUDD_FEIL);
}

if (avtale.getTiltakstype().isVTAO() &&
!oppfølgingStatus.getKvalifiseringsgruppe().isKvalifisererTilVTAO()) {
throw new FeilkodeException(Feilkode.KVALIFISERINGSGRUPPE_VTAO_FEIL);
}

return oppfølgingStatus;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ public enum Feilkode {
KAN_IKKE_OPPDATERE_KOSTNADSSTED_INGAATT_AVTALE,
KVALIFISERINGSGRUPPE_MIDLERTIDIG_LONNTILSKUDD_OG_SOMMERJOBB_FEIL,
KVALIFISERINGSGRUPPE_VARIG_LONNTILSKUDD_FEIL,
KVALIFISERINGSGRUPPE_VTAO_FEIL,
KVALIFISERINGSGRUPPE_IKKE_RETTIGHET,
HENTING_AV_INNSATSBEHOV_FEILET,
FANT_IKKE_INNSATSBEHOV,
Expand Down
Loading