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.

Sign up for GitHub

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

Jump to bottom

Refactor util method #1459

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Refactor util method #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/components/utdragFraSykefravaeret/Sykmeldinger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ const SykmeldingTittelbeskrivelse = ({ sykmelding }: UtvidbarTittelProps) => {
{erViktigInformasjon && (
<img
height={18}
width={18}
alt="Viktig informasjon"
src={MerInformasjonImage}
className="max-w-[18px]"
/>
)}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/sider/aktivitetskrav/vurdering/AktivitetskravVurderingAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import {
AktivitetskravVurderingDTO,
} from "@/data/aktivitetskrav/aktivitetskravTypes";
import {
isExpiredForhandsvarsel,
tilDatoMedManedNavn,
tilLesbarDatoMedArUtenManedNavn,
} from "@/utils/datoUtils";
import React, { ReactElement } from "react";
import { avventVurderingArsakTexts } from "@/data/aktivitetskrav/aktivitetskravTexts";
import { AktivitetskravAlertstripe } from "@/sider/aktivitetskrav/AktivitetskravAlertstripe";
import { BodyLong, BodyShort, Label } from "@navikt/ds-react";
import { isExpiredForhandsvarsel } from "@/utils/aktivitetskravUtils";

const texts = {
forhandsvarselInfoBody:
Expand All @@ -32,7 +32,7 @@ export const AktivitetskravVurderingAlert = ({

switch (status) {
case AktivitetskravStatus.FORHANDSVARSEL: {
return isExpiredForhandsvarsel(vurdering) ? (
return isExpiredForhandsvarsel(vurdering.varsel?.svarfrist) ? (
<AktivitetskravAlertstripe variant="warning">
<Label size="small">{texts.forhandsvarselWarningLabel}</Label>
<BodyShort size="small">{`Det ble sendt ut et forhåndsvarsel ${vurderingDato}.`}</BodyShort>
Expand Down
5 changes: 3 additions & 2 deletions src/sider/aktivitetskrav/vurdering/VurderAktivitetskravTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { OppfyltAktivitetskravSkjema } from "@/sider/aktivitetskrav/vurdering/Op
import { SendForhandsvarselSkjema } from "@/sider/aktivitetskrav/vurdering/SendForhandsvarselSkjema";
import { IkkeOppfyltAktivitetskravSkjema } from "@/sider/aktivitetskrav/vurdering/IkkeOppfyltAktivitetskravSkjema";
import styled from "styled-components";
import { isExpiredForhandsvarsel } from "@/utils/aktivitetskravUtils";
import { isExpiredForhandsvarsel } from "@/utils/datoUtils";

const texts = {
unntak: "Sett unntak",
Expand Down Expand Up @@ -53,7 +53,8 @@ export const VurderAktivitetskravTabs = ({
}: VurderAktivitetskravTabsProps) => {
const latestVurdering = aktivitetskrav.vurderinger[0];
const isIkkeOppfyltTabVisible =
latestVurdering && isExpiredForhandsvarsel(latestVurdering);
latestVurdering &&
isExpiredForhandsvarsel(latestVurdering.varsel?.svarfrist);
const isForhandsvarselTabVisible = isValidStateForForhandsvarsel(
aktivitetskrav.status
);
Expand Down
18 changes: 1 addition & 17 deletions src/utils/aktivitetskravUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import {
AktivitetskravDTO,
AktivitetskravVurderingDTO,
} from "@/data/aktivitetskrav/aktivitetskravTypes";
import { AktivitetskravDTO } from "@/data/aktivitetskrav/aktivitetskravTypes";
import { OppfolgingstilfelleDTO } from "@/data/oppfolgingstilfelle/person/types/OppfolgingstilfellePersonDTO";
import dayjs from "dayjs";

export const oppfolgingstilfelleForAktivitetskrav = (
aktivitetskrav: AktivitetskravDTO,
Expand All @@ -23,15 +19,3 @@ export const gjelderOppfolgingstilfelle = (
aktivitetskrav.stoppunktAt <= oppfolgingstilfelle.end
);
};

export const isExpiredForhandsvarsel = (
vurdering: AktivitetskravVurderingDTO
): boolean => {
if (vurdering.varsel?.svarfrist) {
const svarfrist = dayjs(vurdering.varsel.svarfrist);
const today = dayjs(new Date());
return svarfrist.isBefore(today, "date");
}

return false;
};
12 changes: 8 additions & 4 deletions src/utils/globalNavigasjonUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ import {
SenOppfolgingStatus,
} from "@/data/senoppfolging/senOppfolgingTypes";
import { VedtakResponseDTO } from "@/data/frisktilarbeid/frisktilarbeidTypes";
import { isExpiredForhandsvarsel } from "@/utils/aktivitetskravUtils";
import { VurderingResponseDTO as ManglendeMedvirkningVurderingResponseDTO } from "@/data/manglendemedvirkning/manglendeMedvirkningTypes";
import { isExpiredForhandsvarsel as isExpired } from "@/utils/datoUtils";
import { isExpiredForhandsvarsel } from "@/utils/datoUtils";

const getNumberOfMoteOppgaver = (
motebehov: MotebehovVeilederDTO[],
Expand Down Expand Up @@ -66,7 +65,8 @@ const getNumberOfAktivitetskravOppgaver = (
});
const latestVurdering = aktivitetskrav[0]?.vurderinger[0];
const latestVurderingIsExpiredForhandsvarsel =
latestVurdering && isExpiredForhandsvarsel(latestVurdering);
latestVurdering &&
isExpiredForhandsvarsel(latestVurdering.varsel?.svarfrist);

return newAktivitetskrav || latestVurderingIsExpiredForhandsvarsel ? 1 : 0;
};
Expand Down Expand Up @@ -142,7 +142,11 @@ function getNumberOfManglendeMedvirkningOppgaver(
| ManglendeMedvirkningVurderingResponseDTO
| undefined
): number {
return isExpired(manglendeMedvirkningVurdering?.varsel?.svarfrist) ? 1 : 0;
return isExpiredForhandsvarsel(
manglendeMedvirkningVurdering?.varsel?.svarfrist
)
? 1
: 0;
}

export const numberOfTasks = (
Expand Down