-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3514 from navikt/kontrollsamtale-oppdatering
Kan opprette, oppdatere, og annullere kontrollsamtaler
- Loading branch information
Showing
39 changed files
with
932 additions
and
253 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,48 @@ | ||
import { Kontrollsamtale } from '~src/types/Kontrollsamtale'; | ||
import { toStringDateOrNull } from '~src/utils/date/dateUtils'; | ||
import { | ||
AnnullerKontrollsamtaleRequest, | ||
Kontrollsamtale, | ||
OppdaterKontrollsamtaleInnkallingsdatoRequest, | ||
OppdaterKontrollsamtaleStatusOgJournalpostRequest, | ||
} from '~src/types/Kontrollsamtale'; | ||
|
||
import apiClient from './apiClient'; | ||
|
||
export const settNyDatoForKontrollsamtale = (args: { sakId: string; nyDato: Date }) => | ||
apiClient({ | ||
url: `/saker/${args.sakId}/kontrollsamtaler/nyDato`, | ||
export const hentKontrollsamtaler = (arg: { sakId: string }) => | ||
apiClient<Kontrollsamtale[]>({ | ||
url: `/saker/${arg.sakId}/kontrollsamtaler`, | ||
method: 'GET', | ||
}); | ||
|
||
export const opprettNyKontrollsamtale = (arg: { sakId: string; innkallingsmåned: string }) => | ||
apiClient<Kontrollsamtale>({ | ||
url: `/saker/${arg.sakId}/kontrollsamtaler`, | ||
method: 'POST', | ||
body: { | ||
nyDato: toStringDateOrNull(args.nyDato), | ||
innkallingsmåned: arg.innkallingsmåned, | ||
}, | ||
}); | ||
|
||
export const fetchNesteKontrollsamtale = (sakId: string) => | ||
export const oppdaterKontrollsamtaleStatusOgJournalpost = (arg: OppdaterKontrollsamtaleStatusOgJournalpostRequest) => | ||
apiClient<Kontrollsamtale>({ | ||
url: `/saker/${sakId}/kontrollsamtaler/hent`, | ||
method: 'GET', | ||
url: `/saker/${arg.sakId}/kontrollsamtaler/${arg.kontrollsamtaleId}/status`, | ||
method: 'PATCH', | ||
body: { | ||
status: arg.status, | ||
journalpostId: arg.journalpostId, | ||
}, | ||
}); | ||
|
||
export const hentKontrollsamtaler = (arg: { sakId: string }) => | ||
apiClient<Kontrollsamtale[]>({ | ||
url: `/saker/${arg.sakId}/kontrollsamtaler`, | ||
method: 'GET', | ||
export const oppdaterKontrollsamtaleInnkallingsdato = (arg: OppdaterKontrollsamtaleInnkallingsdatoRequest) => | ||
apiClient<Kontrollsamtale>({ | ||
url: `/saker/${arg.sakId}/kontrollsamtaler/${arg.kontrollsamtaleId}/innkallingsmåned`, | ||
method: 'PATCH', | ||
body: { | ||
innkallingsmåned: arg.innkallingsmåned, | ||
}, | ||
}); | ||
|
||
export const annullerKontrollsamtale = (arg: AnnullerKontrollsamtaleRequest) => | ||
apiClient<Kontrollsamtale>({ | ||
url: `/saker/${arg.sakId}/kontrollsamtaler/${arg.kontrollsamtaleId}`, | ||
method: 'DELETE', | ||
}); |
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
2 changes: 1 addition & 1 deletion
2
src/components/oppsummering/oppsummeringAvVilkårOgGrunnlag/OppsummeringAvAldersvilkår.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
2 changes: 1 addition & 1 deletion
2
src/components/oppsummering/oppsummeringAvVilkårOgGrunnlag/OppsummeringAvBosituasjon.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
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
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
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
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
2 changes: 1 addition & 1 deletion
2
...components/oppsummering/oppsummeringAvVilkårOgGrunnlag/OppsummeringAvOpplysningsplikt.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
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
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
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
23 changes: 23 additions & 0 deletions
23
src/pages/kontrollsamtale/HentOgVisKontrollsamtaler.module.less
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,23 @@ | ||
@import '@styles/variables.less'; | ||
|
||
.kontrollsamtalerContainer { | ||
display: grid; | ||
flex-direction: column; | ||
gap: @spacing-s; | ||
max-height: 500px; | ||
padding-right: 2rem; | ||
overflow: auto; | ||
} | ||
|
||
/* | ||
::-webkit-scrollbar { | ||
-webkit-appearance: none; | ||
width: 5px; | ||
} | ||
::-webkit-scrollbar-thumb { | ||
border-radius: 2px; | ||
background-color: rgba(0, 0, 0, 0.5); | ||
-webkit-box-shadow: 0 0 1px rgba(255, 255, 255, 0.5); | ||
} | ||
*/ |
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,58 @@ | ||
import * as RemoteData from '@devexperts/remote-data-ts'; | ||
import { BodyShort, Skeleton } from '@navikt/ds-react'; | ||
import { useEffect } from 'react'; | ||
|
||
import * as kontrollsamtaleApi from '~src/api/kontrollsamtaleApi'; | ||
import ApiErrorAlert from '~src/components/apiErrorAlert/ApiErrorAlert'; | ||
import Oppsummeringspanel, { | ||
Oppsummeringsfarge, | ||
Oppsummeringsikon, | ||
} from '~src/components/oppsummering/oppsummeringspanel/Oppsummeringspanel'; | ||
import { pipe } from '~src/lib/fp'; | ||
import { useApiCall } from '~src/lib/hooks'; | ||
|
||
import styles from './HentOgVisKontrollsamtaler.module.less'; | ||
import OppsummeringAvKontrollsamtale from './OppsummeringAvKontrollsamtale'; | ||
|
||
const HentOgVisKontrollsamtaler = (props: { sakId: string }) => { | ||
const [kontrollsamtaler, hentKontrollsamtaler] = useApiCall(kontrollsamtaleApi.hentKontrollsamtaler); | ||
|
||
useEffect(() => { | ||
hentKontrollsamtaler({ sakId: props.sakId }); | ||
}, []); | ||
|
||
return ( | ||
<Oppsummeringspanel | ||
ikon={Oppsummeringsikon.Liste} | ||
farge={Oppsummeringsfarge.Lilla} | ||
tittel="Registrerte kontrollsamtaler" | ||
> | ||
{pipe( | ||
kontrollsamtaler, | ||
RemoteData.fold( | ||
() => null, | ||
() => <Skeleton />, | ||
(err) => <ApiErrorAlert error={err} />, | ||
(kontrollsamtaler) => | ||
kontrollsamtaler.length === 0 ? ( | ||
<BodyShort>Ingen kontrollsamtaler registrert</BodyShort> | ||
) : ( | ||
<ul className={styles.kontrollsamtalerContainer}> | ||
{kontrollsamtaler.map((k) => ( | ||
<li key={k.id}> | ||
<OppsummeringAvKontrollsamtale | ||
sakId={props.sakId} | ||
kontrollsamtale={k} | ||
medEdit | ||
/> | ||
</li> | ||
))} | ||
</ul> | ||
), | ||
), | ||
)} | ||
</Oppsummeringspanel> | ||
); | ||
}; | ||
|
||
export default HentOgVisKontrollsamtaler; |
Oops, something went wrong.