-
Notifications
You must be signed in to change notification settings - Fork 1
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
EY-4798 Vis advarsel hvis det er gjeldende unntak i saken #6474
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
778af2d
Vis advarsel hvis det er gjeldende unntak i saken
oyvindsh 3831591
Merge branch 'main' into ey-4798-advarsel-ved-unntak
oyvindsh 91dd883
Merge branch 'main' into ey-4798-advarsel-ved-unntak
oyvindsh c1ea668
Merge branch 'main' into ey-4798-advarsel-ved-unntak
oyvindsh dc804ab
Merge branch 'main' into ey-4798-advarsel-ved-unntak
oyvindsh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
32 changes: 32 additions & 0 deletions
32
...latte-saksbehandling-ui/client/src/components/aktivitetsplikt/brev/LoependeUnntakInfo.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { Alert } from '@navikt/ds-react' | ||
import React from 'react' | ||
import { useAktivitetspliktOppgaveVurdering } from '~components/aktivitetsplikt/OppgaveVurderingRoute' | ||
import { IAktivitetspliktVurderingNyDto } from '~shared/types/Aktivitetsplikt' | ||
|
||
function loeperUnntakEtterSisteVurdering(vurdering: IAktivitetspliktVurderingNyDto): boolean { | ||
const nyesteVurdering = [...vurdering.aktivitet] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Trenger vi å lage en ny array her egentlig, kan du ikke bare returnere siste element? :D |
||
.sort((a, b) => new Date(a.fom).getTime() - new Date(b.fom).getTime()) | ||
.pop() | ||
if (!nyesteVurdering) { | ||
return true | ||
} | ||
const nyesteFom = new Date(nyesteVurdering.fom) | ||
|
||
const harUnntakSomLoeper = vurdering.unntak.some((unntak) => !unntak.tom || new Date(unntak.tom) >= nyesteFom) | ||
return harUnntakSomLoeper | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. return in place |
||
} | ||
|
||
export function LoependeUnntakInfo() { | ||
const { aktivtetspliktbrevdata, vurdering } = useAktivitetspliktOppgaveVurdering() | ||
const harUnntakLoepende = loeperUnntakEtterSisteVurdering(vurdering) | ||
if (aktivtetspliktbrevdata?.brevId && harUnntakLoepende) { | ||
return ( | ||
<Alert variant="info"> | ||
Det er unntak som gjelder for samme periode som den siste vurderingen av aktivitet. Hvis unntaket er gjeldende | ||
må innhold i brevet tilpasses. | ||
</Alert> | ||
) | ||
} else { | ||
return null | ||
} | ||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Vi kaller vel "vurdering" her både for aktivitet og unntak, så kanskje
loeperUnntakEtterSisteAktivitet
?