From 893f234100c08a806d2622a534ad941285f8feff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?= Date: Tue, 1 Oct 2024 13:58:27 +0000 Subject: [PATCH 1/4] Add extra doctor info to med cert --- .../src/components/ExtraDoctors/index.tsx | 26 +++++++++++++++++++ .../service-portal/health/src/lib/messages.ts | 5 ++++ .../MedicineCertificate.tsx | 10 +++++++ 3 files changed, 41 insertions(+) create mode 100644 libs/service-portal/health/src/components/ExtraDoctors/index.tsx diff --git a/libs/service-portal/health/src/components/ExtraDoctors/index.tsx b/libs/service-portal/health/src/components/ExtraDoctors/index.tsx new file mode 100644 index 000000000000..afd70521a06c --- /dev/null +++ b/libs/service-portal/health/src/components/ExtraDoctors/index.tsx @@ -0,0 +1,26 @@ +import { RightsPortalMethylDoctor } from '@island.is/api/schema' +import { Box, Text } from '@island.is/island-ui/core' + +interface Props { + doctors?: RightsPortalMethylDoctor[] +} + +export const ExtraDoctors = ({ doctors }: Props) => { + const docs = doctors?.map((doctor) => doctor.name) + + if (!docs || docs.length === 0) { + return null + } + + return ( + + {docs.map((doc) => ( + + + {doc} + + + ))} + + ) +} diff --git a/libs/service-portal/health/src/lib/messages.ts b/libs/service-portal/health/src/lib/messages.ts index 6ea14565057b..cd7a7d132763 100644 --- a/libs/service-portal/health/src/lib/messages.ts +++ b/libs/service-portal/health/src/lib/messages.ts @@ -940,6 +940,11 @@ export const messages = defineMessages({ id: 'sp.health:medicine-name-of-doctor', defaultMessage: 'Heiti læknis', }, + medicineNameOfDocExtra: { + id: 'sp.health:medicine-name-of-doc-extra', + defaultMessage: + 'Læknar sem hafa einnig leyfi til að ávísa Metylfenidat lyfjum fyrir einstakling', + }, medicineCalculatorAddToPurchaseLabel: { id: 'sp.health:medicine-calculator-add-to-purchase-label', defaultMessage: 'Bæta {arg} við lyfjakaupalista', diff --git a/libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.tsx b/libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.tsx index 82d760c68404..2df649e26c8e 100644 --- a/libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.tsx +++ b/libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.tsx @@ -12,6 +12,7 @@ import { messages } from '../../lib/messages' import { useLocale } from '@island.is/localization' import { HealthPaths } from '../../lib/paths' import { Problem } from '@island.is/react-spa/shared' +import { ExtraDoctors } from '../../components/ExtraDoctors' type UseParams = { type: string @@ -101,6 +102,15 @@ export const MedicineCertificate = () => { valueColumnSpan={['6/12']} /> )} + {certificate.methylDoctors && certificate.methylDoctors.length && ( + } + labelColumnSpan={['6/12']} + valueColumnSpan={['6/12']} + /> + )} {certificate.approved !== null && ( Date: Tue, 1 Oct 2024 14:18:10 +0000 Subject: [PATCH 2/4] Fix --- .../health/src/components/ExtraDoctors/index.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/service-portal/health/src/components/ExtraDoctors/index.tsx b/libs/service-portal/health/src/components/ExtraDoctors/index.tsx index afd70521a06c..46006c7b4f70 100644 --- a/libs/service-portal/health/src/components/ExtraDoctors/index.tsx +++ b/libs/service-portal/health/src/components/ExtraDoctors/index.tsx @@ -1,12 +1,13 @@ import { RightsPortalMethylDoctor } from '@island.is/api/schema' import { Box, Text } from '@island.is/island-ui/core' +import { isDefined } from '@island.is/shared/utils' interface Props { doctors?: RightsPortalMethylDoctor[] } export const ExtraDoctors = ({ doctors }: Props) => { - const docs = doctors?.map((doctor) => doctor.name) + const docs = doctors?.map((doctor) => doctor.name).filter(isDefined) if (!docs || docs.length === 0) { return null @@ -14,8 +15,8 @@ export const ExtraDoctors = ({ doctors }: Props) => { return ( - {docs.map((doc) => ( - + {docs.map((doc, i) => ( + {doc} From 39b6700545f1ca7a07cb45ade8cab4f18e1f6ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20H?= Date: Wed, 2 Oct 2024 09:20:00 +0000 Subject: [PATCH 3/4] Update messages.ts --- libs/service-portal/health/src/lib/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/service-portal/health/src/lib/messages.ts b/libs/service-portal/health/src/lib/messages.ts index cd7a7d132763..64986069a8cf 100644 --- a/libs/service-portal/health/src/lib/messages.ts +++ b/libs/service-portal/health/src/lib/messages.ts @@ -943,7 +943,7 @@ export const messages = defineMessages({ medicineNameOfDocExtra: { id: 'sp.health:medicine-name-of-doc-extra', defaultMessage: - 'Læknar sem hafa einnig leyfi til að ávísa Metylfenidat lyfjum fyrir einstakling', + 'Aukalæknar skráðir á skírteini', }, medicineCalculatorAddToPurchaseLabel: { id: 'sp.health:medicine-calculator-add-to-purchase-label', From 6e47f27eeeec5404816d235dc21e177d7ceb5e3f Mon Sep 17 00:00:00 2001 From: andes-it Date: Wed, 2 Oct 2024 09:24:40 +0000 Subject: [PATCH 4/4] chore: nx format:write update dirty files --- libs/service-portal/health/src/lib/messages.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/service-portal/health/src/lib/messages.ts b/libs/service-portal/health/src/lib/messages.ts index 64986069a8cf..5414196153db 100644 --- a/libs/service-portal/health/src/lib/messages.ts +++ b/libs/service-portal/health/src/lib/messages.ts @@ -942,8 +942,7 @@ export const messages = defineMessages({ }, medicineNameOfDocExtra: { id: 'sp.health:medicine-name-of-doc-extra', - defaultMessage: - 'Aukalæknar skráðir á skírteini', + defaultMessage: 'Aukalæknar skráðir á skírteini', }, medicineCalculatorAddToPurchaseLabel: { id: 'sp.health:medicine-calculator-add-to-purchase-label',