diff --git a/libs/application/templates/aosh/work-accident-notification/src/fields/Occupation/index.tsx b/libs/application/templates/aosh/work-accident-notification/src/fields/Occupation/index.tsx index 3eb540f720c1..4f69c4a7dfa8 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/fields/Occupation/index.tsx +++ b/libs/application/templates/aosh/work-accident-notification/src/fields/Occupation/index.tsx @@ -141,6 +141,8 @@ export const Occupation: FC< } const onChangeMajorGroup = (value?: EventOption) => { + setValue(`employee[${idx}].victimsOccupation`, undefined) + if (!value || !value.value || !value.label) return const selectedGroup: Options = { value: value.value, diff --git a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/ConclusionSection/index.ts b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/ConclusionSection/index.ts index a319a8c772b9..c16df973a835 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/ConclusionSection/index.ts +++ b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/ConclusionSection/index.ts @@ -12,6 +12,7 @@ import { conclusion } from '../../../lib/messages' export const conclusionSection = buildSection({ id: 'conclusion', title: '', + tabTitle: conclusion.general.title, children: [ buildMultiField({ id: 'uiForms.conclusionMultifield', diff --git a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/companySection.ts b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/companySection.ts index 99818937fb19..c772b4b73b2a 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/companySection.ts +++ b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/companySection.ts @@ -160,6 +160,7 @@ export const companySection = buildSubSection({ title: information.labels.company.phonenumber, width: 'half', required: true, + enableCountrySelector: true, defaultValue: (application: Application) => getValueViaPath( application.externalData, diff --git a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/prerequisitesSection.ts b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/prerequisitesSection.ts index f7ef164ff598..1a5646d7ba3f 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/prerequisitesSection.ts +++ b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/prerequisitesSection.ts @@ -5,7 +5,7 @@ import { buildSubmitField, coreMessages, } from '@island.is/application/core' -import { externalData } from '../../lib/messages' +import { externalData, shared } from '../../lib/messages' import { UserProfileApi, IdentityApi, @@ -16,6 +16,7 @@ import { DefaultEvents } from '@island.is/application/types' export const prerequisitesSection = buildSection({ id: 'externalData', title: '', + tabTitle: shared.application.prereqTabTitle, children: [ buildExternalDataProvider({ id: 'externalData', diff --git a/libs/application/templates/aosh/work-accident-notification/src/lib/messages/sections.ts b/libs/application/templates/aosh/work-accident-notification/src/lib/messages/sections.ts index 17150c1e5460..b67a801baa94 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/lib/messages/sections.ts +++ b/libs/application/templates/aosh/work-accident-notification/src/lib/messages/sections.ts @@ -1,38 +1,6 @@ import { defineMessages } from 'react-intl' export const sections = { - prerequisites: defineMessages({ - dataFetching: { - id: 'aosh.wan.application:sections.prerequisites.dataFetching', - defaultMessage: 'Gagnaöflun', - description: 'Title of external data section (right side panel)', - }, - information: { - id: 'aosh.wan.application:sections.prerequisites.pageTitle', - defaultMessage: 'Tilkynningaraðili', - description: `Title of company section (right side panel)`, - }, - accident: { - id: 'aosh.wan.application:sections.prerequisites.accident', - defaultMessage: 'Slysið', - description: 'Title of the accident section (right side panel)', - }, - employee: { - id: 'aosh.wan.application:sections.prerequisites.employee', - defaultMessage: 'Starfsmaður', - description: 'Title of the employee setion (right side panel)', - }, - overview: { - id: 'aosh.wan.application:sections.prerequisites.overview', - defaultMessage: 'Yfirlit', - description: 'Title of the overview setion (right side panel)', - }, - conclusion: { - id: 'aosh.wan.application:sections.prerequisites.conclusion', - defaultMessage: 'Staðfesting', - description: 'Title of the conclusion setion (right side panel)', - }, - }), draft: defineMessages({ dataFetching: { id: 'aosh.wan.application:sections.draft.dataFetching', diff --git a/libs/application/templates/aosh/work-accident-notification/src/lib/messages/shared.ts b/libs/application/templates/aosh/work-accident-notification/src/lib/messages/shared.ts index 5148349007b3..d057abf09bdb 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/lib/messages/shared.ts +++ b/libs/application/templates/aosh/work-accident-notification/src/lib/messages/shared.ts @@ -30,6 +30,11 @@ export const shared = { description: 'Description of application state/status when the application is in prerequisites', }, + prereqTabTitle: { + id: 'aosh.wan.application:shared.application.prereqTabTitle', + defaultMessage: 'Gagnaöflun', + description: 'Title of prerequisites tab', + }, }), options: defineMessages({ no: {