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

MIJN-9836-feature/Add disclaimer when hulpmiddel wmo is both in actueel and non actueel #1678

Merged
merged 5 commits into from
Dec 19, 2024
Merged

MIJN-9836-feature/Add disclaimer when hulpmiddel wmo is both in actueel and non actueel #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de12791
Add disclaimer when hulpmiddel wmo is both in actueel and non actueel
OscarBakker Dec 17, 2024
ca0d7af
Disclaimer fixes
OscarBakker Dec 18, 2024
5495647
Change title to let op
OscarBakker Dec 18, 2024
a371380
Merge branch 'main' into MIJN-9836-disclaimer-tekst-bij-hulpmiddelen-…
OscarBakker Dec 19, 2024
fa62dd8
Merge branch 'main' into MIJN-9836-disclaimer-tekst-bij-hulpmiddelen-…
OscarBakker Dec 19, 2024
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
130 changes: 130 additions & 0 deletions mocks/fixtures/zorgned-jzd-aanvragen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5752,6 +5752,136 @@
}
]
},
{
"identificatie": "2717112",
"regeling": {
"identificatie": "WMO",
"omschrijving": "WMO"
},
"hulpvraag": {
"datumRegistratie": "2024-08-29"
},
"datumAanmelding": "2024-08-29",
"datumAanvraag": "2024-08-29",
"beschikking": {
"beschikkingNummer": 300989920,
"datumAfgifte": "2024-08-29",
"beschikteProducten": [
{
"identificatie": "1213392",
"product": {
"identificatie": "07A09",
"productCode": "07A09",
"productsoortCode": "DBS",
"omschrijving": "PGB: dagbesteding samenwerken"
},
"productCategorie": {
"code": "07",
"omschrijving": "Dagbesteding"
},
"resultaat": "toegewezen1",
"toegewezenProduct": {
"datumEindeGeldigheid": "2024-10-31",
"actueel": false,
"omvang": {
"volume": 1,
"eenheid": {
"code": "82",
"omschrijving": "Stuks (output)"
},
"frequentie": {
"code": "4",
"omschrijving": "Per maand"
},
"omschrijving": "1 stuks (output) per maand"
},
"leveringsvorm": "pgb",
"leverancier": {
"identificatie": "73731545",
"agbcode": "73731545",
"omschrijving": "Carehouse - Leveo Care (afgewezen)"
},
"toewijzingen": [],
"betrokkenen": ["123123123123"]
}
}
]
},
"documenten": [
{
"documentidentificatie": "B2814508",
"omschrijving": "Besluit: Naam in Inkijk-API",
"omschrijvingclientportaal": "Besluit: Naam in Inkijk-API",
"datumDefinitief": "2024-08-29T16:48:11.997"
}
]
},
{
"identificatie": "2717111",
"regeling": {
"identificatie": "WMO",
"omschrijving": "WMO"
},
"hulpvraag": {
"datumRegistratie": "2024-08-29"
},
"datumAanmelding": "2024-08-29",
"datumAanvraag": "2024-08-29",
"beschikking": {
"beschikkingNummer": 300989920,
"datumAfgifte": "2024-08-29",
"beschikteProducten": [
{
"identificatie": "1213392",
"product": {
"identificatie": "07A09",
"productCode": "07A09",
"productsoortCode": "DBS",
"omschrijving": "PGB: dagbesteding samenwerken"
},
"productCategorie": {
"code": "07",
"omschrijving": "Dagbesteding"
},
"resultaat": "toegewezen",
"toegewezenProduct": {
"datumIngangGeldigheid": "2024-11-01",
"datumEindeGeldigheid": "2025-10-31",
"datumCheck": "2026-08-18",
"actueel": true,
"omvang": {
"volume": 1,
"eenheid": {
"code": "82",
"omschrijving": "Stuks (output)"
},
"frequentie": {
"code": "4",
"omschrijving": "Per maand"
},
"omschrijving": "1 stuks (output) per maand"
},
"leveringsvorm": "pgb",
"leverancier": {
"identificatie": "73731545",
"agbcode": "73731545",
"omschrijving": "Carehouse - Leveo Care (huidig)"
},
"toewijzingen": [],
"betrokkenen": ["123123123123"]
}
}
]
},
"documenten": [
{
"documentidentificatie": "B2814508",
"omschrijving": "Besluit: Naam in Inkijk-API",
"omschrijvingclientportaal": "Besluit: Naam in Inkijk-API",
"datumDefinitief": "2024-08-29T16:48:11.997"
}
]
},
{
"identificatie": "2701419",
"regeling": {
Expand Down
11 changes: 10 additions & 1 deletion src/client/pages/ZorgDetail/ZorgDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useParams } from 'react-router-dom';
import { WMOVoorzieningFrontend } from '../../../server/services/wmo/wmo-config-and-types';
import { AppRoutes } from '../../../universal/config/routes';
import { isError, isLoading } from '../../../universal/helpers/api';
import { ThemaIcon } from '../../components';
import { ErrorAlert, ThemaIcon } from '../../components';
import { Datalist } from '../../components/Datalist/Datalist';
import DocumentListV2 from '../../components/DocumentList/DocumentListV2';
import { ThemaTitles } from '../../config/thema';
Expand All @@ -28,6 +28,15 @@ function WMODetailContent({ voorziening }: WMODetailContentProps) {
<>
{!!rows.length && (
<Grid.Cell span="all">
{voorziening?.disclaimer && (
<ErrorAlert
className="ams-mb--sm"
severity="warning"
title="Let op!"
>
{voorziening.disclaimer}
</ErrorAlert>
)}
<Datalist rows={rows} />
{voorziening?.documents.length > 0 && (
<DocumentListV2
Expand Down
150 changes: 150 additions & 0 deletions src/server/services/wmo/__snapshots__/wmo.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,81 @@ exports[`Transform api items > fetchWmo 1`] = `
"supplier": "HVO Querido",
"title": "Logeeropvang Respijt",
},
{
"dateDecision": "2024-08-29T16:48:11.997",
"dateDecisionFormatted": "29 augustus 2024",
"decision": "Toegewezen",
"documents": [
{
"datePublished": "2024-08-29T16:48:11.997",
"id": "B2814508",
"title": "Besluit: Naam in Inkijk-API",
"url": "http://bff-api-host/api/v1/services/wmo/document/123-123-123-123",
},
],
"id": "3271828893",
"isActual": true,
"itemTypeCode": "DBS",
"link": {
"title": "Meer informatie",
"to": "/zorg-en-ondersteuning/voorziening/3271828893",
},
"status": "Besluit genomen",
"statusDate": "2024-08-29T16:48:11.997",
"statusDateFormatted": "29 augustus 2024",
"steps": [
{
"datePublished": "",
"description": "<p>Uw aanvraag is ontvangen.</p>",
"documents": [],
"id": "status-step-0",
"isActive": false,
"isChecked": true,
"isVisible": true,
"status": "Aanvraag ontvangen",
},
{
"datePublished": "2024-08-29",
"description": "<p>Uw aanvraag is in behandeling.</p>",
"documents": [],
"id": "status-step-1",
"isActive": false,
"isChecked": true,
"isVisible": true,
"status": "In behandeling",
},
{
"datePublished": "2024-08-29T16:48:11.997",
"description": "<p>U krijgt PGB: dagbesteding samenwerken per 01 november 2024.</p>
<p>In de brief leest u meer over dit besluit. De brief staat bovenaan deze pagina.</p>
",
"documents": [],
"id": "status-step-3",
"isActive": true,
"isChecked": true,
"isVisible": true,
"status": "Besluit genomen",
},
{
"datePublished": "",
"description": "<p>
Uw recht op PGB: dagbesteding samenwerken stopt op 31 oktober 2025.
</p>

<p>Wilt u verlenging aanvragen, dan moet u dat 8 weken voor 31 oktober 2025 doen.</p>
<p>Kijk in uw besluit of op <a rel="noreferrer" class="ams-link ams-link--inline" href="https://www.amsterdam.nl/zorg-ondersteuning/hulp-zorg-betalen/persoonsgebonden/?vkurl=pgb">amsterdam.nl/pgb</a> voor meer informatie.</p>
",
"documents": [],
"id": "status-step-4",
"isActive": false,
"isChecked": false,
"isVisible": true,
"status": "Einde recht",
},
],
"supplier": "Carehouse - Leveo Care (huidig)",
"title": "PGB: dagbesteding samenwerken",
},
{
"dateDecision": "2024-08-29T16:48:11.997",
"dateDecisionFormatted": "29 augustus 2024",
Expand Down Expand Up @@ -239,6 +314,81 @@ exports[`Transform api items > fetchWmo 1`] = `
"supplier": "Carehouse - Leveo Care",
"title": "PGB: dagbesteding meewerken (toegewezen)",
},
{
"dateDecision": "2024-08-29T16:48:11.997",
"dateDecisionFormatted": "29 augustus 2024",
"decision": "Toegewezen1",
"documents": [
{
"datePublished": "2024-08-29T16:48:11.997",
"id": "B2814508",
"title": "Besluit: Naam in Inkijk-API",
"url": "http://bff-api-host/api/v1/services/wmo/document/123-123-123-123",
},
],
"id": "759557662",
"isActual": true,
"itemTypeCode": "DBS",
"link": {
"title": "Meer informatie",
"to": "/zorg-en-ondersteuning/voorziening/759557662",
},
"status": "Besluit genomen",
"statusDate": "2024-08-29T16:48:11.997",
"statusDateFormatted": "29 augustus 2024",
"steps": [
{
"datePublished": "",
"description": "<p>Uw aanvraag is ontvangen.</p>",
"documents": [],
"id": "status-step-0",
"isActive": false,
"isChecked": true,
"isVisible": true,
"status": "Aanvraag ontvangen",
},
{
"datePublished": "2024-08-29",
"description": "<p>Uw aanvraag is in behandeling.</p>",
"documents": [],
"id": "status-step-1",
"isActive": false,
"isChecked": true,
"isVisible": true,
"status": "In behandeling",
},
{
"datePublished": "2024-08-29T16:48:11.997",
"description": "<p>U krijgt geen PGB: dagbesteding samenwerken.</p>
<p>In de brief leest u meer over dit besluit. De brief staat bovenaan deze pagina.</p>
",
"documents": [],
"id": "status-step-3",
"isActive": false,
"isChecked": true,
"isVisible": true,
"status": "Besluit genomen",
},
{
"datePublished": "",
"description": "<p>
Uw recht op PGB: dagbesteding samenwerken stopt op 31 oktober 2024.
</p>

<p>Wilt u verlenging aanvragen, dan moet u dat 8 weken voor 31 oktober 2024 doen.</p>
<p>Kijk in uw besluit of op <a rel="noreferrer" class="ams-link ams-link--inline" href="https://www.amsterdam.nl/zorg-ondersteuning/hulp-zorg-betalen/persoonsgebonden/?vkurl=pgb">amsterdam.nl/pgb</a> voor meer informatie.</p>
",
"documents": [],
"id": "status-step-4",
"isActive": false,
"isChecked": false,
"isVisible": true,
"status": "Einde recht",
},
],
"supplier": "Carehouse - Leveo Care (afgewezen)",
"title": "PGB: dagbesteding samenwerken",
},
{
"dateDecision": "2024-08-26T11:40:46.087",
"dateDecisionFormatted": "26 augustus 2024",
Expand Down
1 change: 1 addition & 0 deletions src/server/services/wmo/wmo-config-and-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface WMOVoorzieningFrontend extends ZaakDetail {
statusDate: string;
statusDateFormatted: string;
supplier: string | null; // Leverancier
disclaimer?: string;
}

export const DOCUMENT_TITLE_MEER_INFORMATIE_STARTS_WITH = 'Verzoek:'; // Documents starting with this token correspond to the 'meer informatie' step.
Expand Down
Loading
Loading