FAGSYSTEM-375364 hindrer at tekniske fri utsettelser(uten mors aktivi… #401
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jolarsen
approved these changes
Mar 27, 2025
jolarsen
reviewed
Mar 27, 2025
| @@ -27,7 +28,7 @@ public SjekkOmMorErIAktivitet() { | |||
| public Evaluation evaluate(FastsettePeriodeGrunnlag grunnlag) { | |||
| var aktuellPeriode = grunnlag.getAktuellPeriode(); | |||
| var dokumentasjonVurdering = aktuellPeriode.getDokumentasjonVurdering(); | |||
| if (dokumentasjonVurdering == null) { | |||
| if (dokumentasjonVurdering == null && MorsAktivitet.ARBEID.equals(aktuellPeriode.getMorsAktivitet())) { | |||
There was a problem hiding this comment.
Det bør ikke gjøre noen forskjell, men skulle det vært
if (dokumentasjonVurdering == null) {
return MorsAktivitet.ARBEID.equals(aktuellPeriode.getMorsAktivitet()) && grunnlag.getAktivitetskravGrunnlag().map(ag -> merEllerLik75Stilling(ag, aktuellPeriode)).orElse(false) ? ja() : nei();
…tet), der saksbehandler ikke har gjort en dokvurdering, innvilges automatisk basert på mors arbeid fra register
palfi
force-pushed
the
feature/FAGSYSTEM-375364
branch
from
d51d307 to
fed5e26
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…tet), der saksbehandler ikke har gjort en dokvurdering, innvilges automatisk basert på mors arbeid fra register
Skal se i db om det gjelder flere saker