diff --git a/frontend/src/employee-frontend/components/application-page/ApplicationEditView.tsx b/frontend/src/employee-frontend/components/application-page/ApplicationEditView.tsx index 386e5a3268..7178ed8f81 100644 --- a/frontend/src/employee-frontend/components/application-page/ApplicationEditView.tsx +++ b/frontend/src/employee-frontend/components/application-page/ApplicationEditView.tsx @@ -1292,6 +1292,21 @@ export default React.memo(function ApplicationEditView({ /> )} + + + + a.type === 'SERVICE_WORKER_ATTACHMENT' + )} + data-qa="file-upload-service-worker" + /> + diff --git a/frontend/src/employee-frontend/components/application-page/ApplicationReadView.tsx b/frontend/src/employee-frontend/components/application-page/ApplicationReadView.tsx index a3f26f675a..727ba015f4 100755 --- a/frontend/src/employee-frontend/components/application-page/ApplicationReadView.tsx +++ b/frontend/src/employee-frontend/components/application-page/ApplicationReadView.tsx @@ -115,6 +115,10 @@ export default React.memo(function ApplicationReadView({ ({ type }) => type === 'EXTENDED_CARE' ) + const serviceWorkerAttachments = attachments.filter( + ({ type }) => type === 'SERVICE_WORKER_ATTACHMENT' + ) + const connectedDaycare = type === 'PRESCHOOL' && serviceNeed !== null const paid = type === 'DAYCARE' || connectedDaycare @@ -576,6 +580,25 @@ export default React.memo(function ApplicationReadView({ {child.diet} )} + + + {serviceWorkerAttachments.length ? ( + <> + {serviceWorkerAttachments.map((attachment) => ( + + ))} + + ) : ( + Ei liitteitä + )} + diff --git a/frontend/src/lib-common/generated/api-types/attachment.ts b/frontend/src/lib-common/generated/api-types/attachment.ts index 8f14d68b05..facf46d813 100644 --- a/frontend/src/lib-common/generated/api-types/attachment.ts +++ b/frontend/src/lib-common/generated/api-types/attachment.ts @@ -12,6 +12,7 @@ import { AttachmentId } from './shared' export type AttachmentType = | 'URGENCY' | 'EXTENDED_CARE' + | 'SERVICE_WORKER_ATTACHMENT' /** * Generated from fi.espoo.evaka.attachment.IncomeAttachment diff --git a/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx b/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx index e189aa42ea..13820fac9f 100755 --- a/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx +++ b/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx @@ -524,7 +524,8 @@ export const fi = { applicationInfo: 'Hakemuksen lisätiedot', allergies: 'Allergiat', diet: 'Erityisruokavalio', - maxFeeAccepted: 'Suostumus korkeimpaan maksuun' + maxFeeAccepted: 'Suostumus korkeimpaan maksuun', + serviceWorkerAttachmentsTitle: 'Palveluohjauksen liitteet' }, decisions: { title: 'Päätökset', diff --git a/service/src/main/kotlin/fi/espoo/evaka/attachment/Attachment.kt b/service/src/main/kotlin/fi/espoo/evaka/attachment/Attachment.kt index 2e4a6e422a..fb636a24c4 100644 --- a/service/src/main/kotlin/fi/espoo/evaka/attachment/Attachment.kt +++ b/service/src/main/kotlin/fi/espoo/evaka/attachment/Attachment.kt @@ -54,4 +54,5 @@ data class MessageAttachment(val id: AttachmentId, val name: String, val content enum class AttachmentType { URGENCY, EXTENDED_CARE, + SERVICE_WORKER_ATTACHMENT, }