From 4dc7e6061f8c1c7a0d0bcb22b2a566590cc73a1c Mon Sep 17 00:00:00 2001 From: disaerna Date: Tue, 4 Feb 2025 09:53:57 +0000 Subject: [PATCH 1/3] fix: disable tags --- .../core/src/components/SortableTable/SortableTable.tsx | 6 +++++- .../my-pages/core/src/components/SortableTable/TableRow.tsx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/portals/my-pages/core/src/components/SortableTable/SortableTable.tsx b/libs/portals/my-pages/core/src/components/SortableTable/SortableTable.tsx index 1f44d5469d82..3ad191354384 100644 --- a/libs/portals/my-pages/core/src/components/SortableTable/SortableTable.tsx +++ b/libs/portals/my-pages/core/src/components/SortableTable/SortableTable.tsx @@ -140,7 +140,11 @@ export const SortableTable = (props: SortableTableProps) => { return { title: valueItem ?? '', content: ( - + {valueItem} ), diff --git a/libs/portals/my-pages/core/src/components/SortableTable/TableRow.tsx b/libs/portals/my-pages/core/src/components/SortableTable/TableRow.tsx index 72bed4b2dc47..1c796f9b886e 100644 --- a/libs/portals/my-pages/core/src/components/SortableTable/TableRow.tsx +++ b/libs/portals/my-pages/core/src/components/SortableTable/TableRow.tsx @@ -31,7 +31,7 @@ export const TableRow = ({ const renderValueItem = (valueItem: any, i: number) => { if (tag && valueItems.length - 1 === i) { return ( - + {valueItem} ) From ffaf25f0efb86810b4f4c0c7aa9b053e2f82958f Mon Sep 17 00:00:00 2001 From: disaerna Date: Tue, 4 Feb 2025 09:54:15 +0000 Subject: [PATCH 2/3] sort by vaccine name --- .../src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx index 28a8540f2392..1bf14c4c47f0 100644 --- a/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx +++ b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx @@ -31,7 +31,7 @@ export const SortedVaccinationsTable = ({ data }: Props) => { status: formatMessage(messages.status), }} expandable - defaultSortByKey="status" + defaultSortByKey="vaccine" mobileTitleKey="vaccine" align="left" tagOutlined From 2c051d5b87338f26c6b5182e206efea56f585763 Mon Sep 17 00:00:00 2001 From: disaerna Date: Tue, 4 Feb 2025 09:54:24 +0000 Subject: [PATCH 3/3] WIP add status explanation --- .../my-pages/health/src/lib/messages.ts | 28 ++++++++++ .../Vaccinations/VaccinationsWrapper.tsx | 51 ++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/libs/portals/my-pages/health/src/lib/messages.ts b/libs/portals/my-pages/health/src/lib/messages.ts index 2fb13b801a22..d4fac1451901 100644 --- a/libs/portals/my-pages/health/src/lib/messages.ts +++ b/libs/portals/my-pages/health/src/lib/messages.ts @@ -1295,4 +1295,32 @@ export const messages = defineMessages({ defaultMessage: 'Ofangreindur aðili má einnig fletta upp mínum lyfjaávísunum í apóteki.', }, + vaccineUnfinished: { + id: 'sp.health:vaccine-unfinished', + defaultMessage: 'Ólokið', + }, + vaccineExpired: { + id: 'sp.health:vaccine-expired', + defaultMessage: 'Útrunnið', + }, + vaccineUnvaccined: { + id: 'sp.health:vaccine-unvaccined', + defaultMessage: 'Óbólusett', + }, + vaccineValid: { + id: 'sp.health:vaccine-valid', + defaultMessage: 'Í gildi', + }, + vaccineFinished: { + id: 'sp.health:vaccine-finished', + defaultMessage: 'Lokið', + }, + vaccineUncertain: { + id: 'sp.health:vaccine-uncertain', + defaultMessage: 'Óljós', + }, + vaccineUnregistered: { + id: 'sp.health:vaccine-unregistered', + defaultMessage: 'Óskráð', + }, }) diff --git a/libs/portals/my-pages/health/src/screens/Vaccinations/VaccinationsWrapper.tsx b/libs/portals/my-pages/health/src/screens/Vaccinations/VaccinationsWrapper.tsx index 16a3e38be597..a4e0bfc0e1c1 100644 --- a/libs/portals/my-pages/health/src/screens/Vaccinations/VaccinationsWrapper.tsx +++ b/libs/portals/my-pages/health/src/screens/Vaccinations/VaccinationsWrapper.tsx @@ -1,4 +1,11 @@ -import { Box, SkeletonLoader, Tabs } from '@island.is/island-ui/core' +import { + Box, + Inline, + SkeletonLoader, + Tabs, + Tag, + Text, +} from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { EmptyTable, @@ -79,6 +86,48 @@ export const VaccinationsWrapper = () => { {/* Tabs content */} {!loading && !error && ( + + + + + {formatMessage(m.vaccineUnfinished)} + + + 'bleblebleb' + + + + + + {formatMessage(m.vaccineExpired) + ': '} + + + + + {formatMessage(m.vaccineUnvaccined) + ': '} + + + + + {formatMessage(m.vaccineValid) + ': '} + + + + + {formatMessage(m.vaccineFinished) + ': '} + + + + + {formatMessage(m.vaccineUncertain) + ': '} + + + + + {formatMessage(m.vaccineUnregistered) + ': '} + + +