diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/DownloadReports/MyPdfDocument/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/DownloadReports/MyPdfDocument/index.tsx index 8b9a6e775380..eb34bf85d4c9 100644 --- a/libs/portals/admin/signature-collection/src/screens-parliamentary/DownloadReports/MyPdfDocument/index.tsx +++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/DownloadReports/MyPdfDocument/index.tsx @@ -10,6 +10,7 @@ import { import logo from './logo.png' import { dark200 } from '@island.is/island-ui/theme' import { SignatureCollectionAreaSummaryReport } from '@island.is/api/schema' +import format from 'date-fns/format' const MyPdfDocument = ({ report, @@ -30,6 +31,11 @@ const MyPdfDocument = ({ Flokkur: {list.candidateName} + Dagsetning: + + {format(new Date(), 'dd.MM.yyyy HH:mm')} + + Listabókstafur: {list.partyBallotLetter} diff --git a/libs/service-portal/core/src/lib/messages.ts b/libs/service-portal/core/src/lib/messages.ts index 7c459b2c841b..7bb01507e4e2 100644 --- a/libs/service-portal/core/src/lib/messages.ts +++ b/libs/service-portal/core/src/lib/messages.ts @@ -565,6 +565,11 @@ export const m = defineMessages({ id: 'service.portal:signatureCollectionParliamentaryLists', defaultMessage: 'Alþingiskosningar - Meðmælasöfnun', }, + signatureCollectionParliamentaryListsCompany: { + id: 'service.portal:signatureCollectionParliamentaryListsCompany', + defaultMessage: + 'Alþingiskosningar - Meðmælasöfnun (Aðeins fyrir stjórnmálasamtök)', + }, signatureCollectionPresidentialLists: { id: 'service.portal:signatureCollectionPresidentialLists', defaultMessage: 'Forsetakosningar - Meðmælasöfnun', diff --git a/libs/service-portal/signature-collection/src/lib/messages.ts b/libs/service-portal/signature-collection/src/lib/messages.ts index 510616d08ca2..c6b7debcd6a4 100644 --- a/libs/service-portal/signature-collection/src/lib/messages.ts +++ b/libs/service-portal/signature-collection/src/lib/messages.ts @@ -173,8 +173,9 @@ export const m = defineMessages({ description: '', }, actorNoAccessDescription: { - id: 'sp.signatureCollection:actorNoAccessDescription', - defaultMessage: 'Þú hefur ekki réttindi til að sjá þessar upplýsingar.', + id: 'sp.signatureCollection:actorNoAccessDescription#markdown', + defaultMessage: + 'Eingöngu kennitölur sem hafa skráðan listabókstaf geta stofnað meðmælendasöfnun. Ef þú átt listabókstaf geturðu stofnað meðmælendasöfnun hér.', description: '', }, @@ -354,6 +355,12 @@ export const m = defineMessages({ defaultMessage: 'Umsjónaraðilar', description: '', }, + supervisorsInfo: { + id: 'sp.signatureCollection:supervisorsInfo', + defaultMessage: + 'Umsjónaraðilar hafa aðgang að öllum upplýsingum safnananna en geta ekki eytt söfnununum. ', + description: '', + }, add: { id: 'sp.signatureCollection:add', defaultMessage: 'Bæta við', diff --git a/libs/service-portal/signature-collection/src/lib/navigation.ts b/libs/service-portal/signature-collection/src/lib/navigation.ts index b42734eb0adb..ce3b10f848e0 100644 --- a/libs/service-portal/signature-collection/src/lib/navigation.ts +++ b/libs/service-portal/signature-collection/src/lib/navigation.ts @@ -8,5 +8,5 @@ export const companySignatureCollectionNavigation: PortalNavigationItem = { icon: { icon: 'receipt', }, - description: m.signatureCollectionParliamentaryLists, + description: m.signatureCollectionParliamentaryListsCompany, } diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx index 6589d6d8ce3b..03b3d947ca2c 100644 --- a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx +++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx @@ -71,9 +71,13 @@ export const PaperSignees = ({ pageNumber: Number(page), }, }, - onCompleted: () => { - toast.success(formatMessage(m.paperSigneeSuccess)) - refetchSignees() + onCompleted: (res) => { + if (res.success) { + toast.success(formatMessage(m.paperSigneeSuccess)) + refetchSignees() + } else { + toast.error(formatMessage(m.paperSigneeError)) + } }, onError: () => { toast.error(formatMessage(m.paperSigneeError)) diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx index 89bf289b13fb..6ebec77d97b2 100644 --- a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx +++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx @@ -36,7 +36,7 @@ const ViewList = () => { {!!listInfo?.collectors?.length && ( <> - {formatMessage(m.coOwners)} + {formatMessage(m.supervisors)} {listInfo?.collectors?.map((collector) => ( {formatMessage(m.supervisors) + ' '} - + diff --git a/libs/service-portal/signature-collection/src/screens/shared/SigneeView/index.tsx b/libs/service-portal/signature-collection/src/screens/shared/SigneeView/index.tsx index 51626a990c18..273581c9e627 100644 --- a/libs/service-portal/signature-collection/src/screens/shared/SigneeView/index.tsx +++ b/libs/service-portal/signature-collection/src/screens/shared/SigneeView/index.tsx @@ -107,7 +107,7 @@ const SigneeView = ({ ) : (