fix: remove steps and add fields to others (#14821)

* fix: remove steps and add fields to others * chore: nx format:write update dirty files * feat: jobtitle if self reporting * fix: pr comments * fix: remove unused function * feat: adjust overview screen for new flow and data * Update libs/application/templates/accident-notification/src/fields/FormOverview/index.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update libs/application/templates/accident-notification/src/utils/isSportAccidentAndEmployee.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: andes-it <[email protected]> Co-authored-by: Ólafur Björn Magnússon <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Jónas G. Sigurðsson <[email protected]> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · May 17, 2024 · 8199e19 · 8199e19
1 parent 60a2597
commit 8199e19
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 83 deletions.
diff --git a/libs/application/templates/accident-notification/src/fields/FormOverview/index.tsx b/libs/application/templates/accident-notification/src/fields/FormOverview/index.tsx
@@ -507,30 +507,10 @@ export const FormOverview: FC<
       </Text>
       <ReviewGroup
         isLast
-        editAction={() => changeScreens('timePassedHindrance')}
+        editAction={() => changeScreens('sportsClubInfo.employee.field')}
         isEditable={application.state === States.DRAFT}
       >
         <GridRow>
-          <GridColumn span={['9/12', '9/12', '9/12', '10/12']}>
-            <ValueLine
-              label={hindrances.carAccident.radioFieldTitle}
-              value={
-                answers.carAccidentHindrance === YES
-                  ? applicationMessages.general.yesOptionLabel
-                  : applicationMessages.general.noOptionLabel
-              }
-            />
-          </GridColumn>
-          <GridColumn span={['9/12', '9/12', '9/12', '10/12']}>
-            <ValueLine
-              label={hindrances.timePassedHindrance.radioFieldTitle}
-              value={
-                answers.timePassedHindrance === YES
-                  ? applicationMessages.general.yesOptionLabel
-                  : applicationMessages.general.noOptionLabel
-              }
-            />
-          </GridColumn>
           {isProfessionalAthleteAccident(answers as FormValue) && (
             <GridColumn span={['9/12', '9/12', '9/12', '10/12']}>
               <ValueLine
@@ -606,6 +586,12 @@ export const FormOverview: FC<
               value={answers.accidentDetails.descriptionOfAccident}
             />
           </GridColumn>
+          <GridColumn span={['9/12', '9/12', '9/12', '10/12']}>
+            <ValueLine
+              label={accidentDetails.labels.symptoms}
+              value={answers.accidentDetails.accidentSymptoms}
+            />
+          </GridColumn>
           <GridColumn span="12/12">
             <FileValueLine label={overview.labels.attachments} files={files} />
             {missingDocuments.length !== 0 && (

diff --git a/...lates/accident-notification/src/forms/AccidentNotificationForm/aboutTheAccidentSection.ts b/...lates/accident-notification/src/forms/AccidentNotificationForm/aboutTheAccidentSection.ts
@@ -20,7 +20,6 @@ import {
   fatalAccident,
   fatalAccidentAttachment,
   fishingCompanyInfo,
-  hindrances,
   injuredPersonInformation,
   locationAndPurpose,
   rescueSquadInfo,
@@ -48,6 +47,7 @@ import {
   getAccidentTypeOptions,
   hideLocationAndPurpose,
   isAgricultureAccident,
+  isDateOlderThanAYear,
   isFatalAccident,
   isFishermanAccident,
   isGeneralWorkplaceAccident,
@@ -57,74 +57,19 @@ import {
   isProfessionalAthleteAccident,
   isReportingOnBehalfOfEmployee,
   isReportingOnBehalfOfInjured,
+  isReportingOnBehalfSelf,
   isRepresentativeOfCompanyOrInstitute,
   isRescueWorkAccident,
   isStudiesAccident,
   isWorkAccident,
 } from '../../utils'
 import { isHealthInsured } from '../../utils/isHealthInsured'
+import { isSportAccidentAndEmployee } from '../../utils/isSportAccidentAndEmployee'
 
 export const aboutTheAccidentSection = buildSection({
   id: 'accidentType.section',
   title: accidentType.general.sectionTitle,
   children: [
-    buildSubSection({
-      id: 'hindrances',
-      title: hindrances.general.sectionTitle,
-      children: [
-        buildMultiField({
-          id: 'timePassedHindrancesMultiField',
-          title: hindrances.timePassedHindrance.radioFieldTitle,
-          children: [
-            buildRadioField({
-              id: 'timePassedHindrance',
-              title: '',
-              options: [
-                { value: YES, label: application.general.yesOptionLabel },
-                { value: NO, label: application.general.noOptionLabel },
-              ],
-              width: 'half',
-              largeButtons: true,
-              required: true,
-            }),
-            buildAlertMessageField({
-              id: 'timePassedHindranceFielAlertMessage',
-              title: hindrances.timePassedHindrance.errorTitle,
-              message: hindrances.timePassedHindrance.errorDescription,
-              alertType: 'info',
-              doesNotRequireAnswer: true,
-              condition: (formValue) => formValue.timePassedHindrance === YES,
-            }),
-          ],
-        }),
-        buildMultiField({
-          id: 'carHindrancesMultiField',
-          title: hindrances.carAccident.radioFieldTitle,
-          children: [
-            buildRadioField({
-              title: '',
-              id: 'carAccidentHindrance',
-              options: [
-                { value: YES, label: application.general.yesOptionLabel },
-                { value: NO, label: application.general.noOptionLabel },
-              ],
-              width: 'half',
-              largeButtons: true,
-              required: true,
-            }),
-            buildAlertMessageField({
-              id: 'carAccidentHindranceFielAlertMessage',
-              title: hindrances.carAccident.errorTitle,
-              message: hindrances.carAccident.errorDescription,
-              alertType: 'info',
-              doesNotRequireAnswer: true,
-              condition: (formValue) => formValue.carAccidentHindrance === YES,
-            }),
-          ],
-        }),
-      ],
-    }),
-
     buildSubSection({
       id: 'accidentType.section',
       title: accidentType.general.subsectionTitle,
@@ -181,6 +126,23 @@ export const aboutTheAccidentSection = buildSection({
               condition: (formValue) => isAgricultureAccident(formValue),
               marginBottom: 5,
             }),
+            buildDescriptionField({
+              id: 'accidentDetails.descriptionField',
+              space: 'containerGutter',
+              title: injuredPersonInformation.general.jobTitle,
+              description: injuredPersonInformation.general.jobTitleDescription,
+              width: 'full',
+              marginBottom: 2,
+              condition: (formValue) => isReportingOnBehalfSelf(formValue),
+            }),
+            buildTextField({
+              id: 'injuredPersonInformation.jobTitle',
+              title: injuredPersonInformation.labels.jobTitle,
+              backgroundColor: 'white',
+              width: 'full',
+              maxLength: 100,
+              condition: (formValue) => isReportingOnBehalfSelf(formValue),
+            }),
           ],
         }),
       ],
@@ -242,6 +204,14 @@ export const aboutTheAccidentSection = buildSection({
                 },
               ],
             }),
+            buildAlertMessageField({
+              id: 'attachments.injuryCertificate.alert',
+              title: application.labels.warningTitle,
+              message: application.labels.warningMessage,
+              alertType: 'info',
+              doesNotRequireAnswer: true,
+              condition: (formValue) => isSportAccidentAndEmployee(formValue),
+            }),
           ],
         }),
 
@@ -293,7 +263,9 @@ export const aboutTheAccidentSection = buildSection({
           id: 'accidentLocation.generalWorkAccident',
           title: accidentLocation.general.heading,
           description: accidentLocation.general.description,
-          condition: (formValue) => isGeneralWorkplaceAccident(formValue),
+          condition: (formValue) =>
+            isGeneralWorkplaceAccident(formValue) ||
+            isSportAccidentAndEmployee(formValue),
           children: [
             buildRadioField({
               id: 'accidentLocation.answer',
@@ -405,7 +377,9 @@ export const aboutTheAccidentSection = buildSection({
           id: 'accidentLocation.professionalAthleteAccident',
           title: accidentLocation.general.heading,
           description: accidentLocation.general.description,
-          condition: (formValue) => isProfessionalAthleteAccident(formValue),
+          condition: (formValue) =>
+            isProfessionalAthleteAccident(formValue) &&
+            !isSportAccidentAndEmployee(formValue),
           children: [
             buildRadioField({
               id: 'accidentLocation.answer',
@@ -518,7 +492,8 @@ export const aboutTheAccidentSection = buildSection({
       title: workMachine.general.sectionTitle,
       condition: (formValue) =>
         isGeneralWorkplaceAccident(formValue) ||
-        isAgricultureAccident(formValue),
+        isAgricultureAccident(formValue) ||
+        isSportAccidentAndEmployee(formValue),
       children: [
         buildMultiField({
           id: 'workMachine',
@@ -582,6 +557,15 @@ export const aboutTheAccidentSection = buildSection({
               width: 'half',
               format: '##:##',
             }),
+            buildAlertMessageField({
+              id: 'accidentDetails.moreThanAYearAlertMessage',
+              title: accidentDetails.general.moreThanAYearAlertTitle,
+              message: accidentDetails.general.moreThanAYearAlertMessage,
+              width: 'full',
+              alertType: 'warning',
+              condition: (formValue) => isDateOlderThanAYear(formValue),
+              marginBottom: 0,
+            }),
             buildAlertMessageField({
               id: 'accidentDetails.notHealthInsuredAlertMessage',
               title: accidentDetails.general.insuranceAlertTitle,
@@ -601,6 +585,37 @@ export const aboutTheAccidentSection = buildSection({
               variant: 'textarea',
               maxLength: 2000,
             }),
+            buildTextField({
+              id: 'accidentDetails.accidentSymptoms',
+              title: accidentDetails.labels.symptoms,
+              placeholder: accidentDetails.placeholder.symptoms,
+              backgroundColor: 'blue',
+              required: true,
+              rows: 10,
+              variant: 'textarea',
+              maxLength: 2000,
+            }),
+            buildDescriptionField({
+              id: 'accidentDetails.descriptionField',
+              space: 'containerGutter',
+              titleVariant: 'h5',
+              title: accidentDetails.labels.doctorVisit,
+              width: 'full',
+            }),
+            buildCustomField({
+              id: 'accidentDetails.dateOfDoctorVisit',
+              title: accidentDetails.labels.date,
+              component: 'DateOfAccident',
+              width: 'half',
+            }),
+            buildTextField({
+              id: 'accidentDetails.timeOfDoctorVisit',
+              title: accidentDetails.labels.time,
+              placeholder: accidentDetails.placeholder.doctorVisitTime,
+              backgroundColor: 'blue',
+              width: 'half',
+              format: '##:##',
+            }),
           ],
         }),
       ],

diff --git a/...ccident-notification/src/forms/AccidentNotificationForm/whoIsTheNotificationForSection.ts b/...ccident-notification/src/forms/AccidentNotificationForm/whoIsTheNotificationForSection.ts
@@ -2,6 +2,7 @@ import {
   buildAlertMessageField,
   buildCheckboxField,
   buildCustomField,
+  buildDescriptionField,
   buildFileUploadField,
   buildMultiField,
   buildRadioField,
@@ -110,6 +111,21 @@ export const whoIsTheNotificationForSection = buildSection({
               width: 'half',
               variant: 'tel',
             }),
+            buildDescriptionField({
+              id: 'accidentDetails.descriptionField',
+              space: 'containerGutter',
+              title: injuredPersonInformation.general.jobTitle,
+              description: injuredPersonInformation.general.jobTitleDescription,
+              width: 'full',
+              marginBottom: 2,
+            }),
+            buildTextField({
+              id: 'injuredPersonInformation.jobTitle',
+              title: injuredPersonInformation.labels.jobTitle,
+              backgroundColor: 'white',
+              width: 'full',
+              maxLength: 100,
+            }),
           ],
         }),
       ],

diff --git a/libs/application/templates/accident-notification/src/lib/dataSchema.ts b/libs/application/templates/accident-notification/src/lib/dataSchema.ts
@@ -163,6 +163,9 @@ export const AccidentNotificationSchema = z.object({
     descriptionOfAccident: z.string().refine((x) => x.trim().length > 0, {
       params: error.invalidValue,
     }),
+    accidentSymptoms: z.string().refine((x) => x.trim().length > 0, {
+      params: error.invalidValue,
+    }),
   }),
   isRepresentativeOfCompanyOrInstitue: z.array(z.string()).optional(),
   fishingShipInfo: z.object({

diff --git a/libs/application/templates/accident-notification/src/lib/messages/accidentDetails.ts b/libs/application/templates/accident-notification/src/lib/messages/accidentDetails.ts
@@ -26,6 +26,18 @@ export const accidentDetails = {
       description:
         'According to electronic information from the Director of Internal Revenue, you do not appear to have filled in the appropriate field on your tax return and are therefore not insured against household related accidents during the period in which the accident took place.',
     },
+    moreThanAYearAlertTitle: {
+      id: 'an.application:accidentDetails.general.moreThanAYearAlertTitle',
+      defaultMessage: 'Athugið',
+      description: 'Alert',
+    },
+    moreThanAYearAlertMessage: {
+      id: 'an.application:accidentDetails.general.moreThanAYearAlertMessage',
+      defaultMessage:
+        'Öll slys skal að jafnaði tilkynna innan eins árs, en heimilt er að veita undanþágu frá þeirri reglu, að ákveðnum forsendum uppfylltum.',
+      description:
+        'The accident took place more than a year ago. It is necessary to contact the Insurance Fund for further instructions.',
+    },
   }),
   labels: defineMessages({
     date: {
@@ -43,6 +55,16 @@ export const accidentDetails = {
       defaultMessage: 'Ýtarleg lýsing á slysi',
       description: 'Description of accident',
     },
+    symptoms: {
+      id: 'an.application:accidentDetails.labels.symptoms',
+      defaultMessage: 'Lýsing á einkennum og afleiðingum slyss',
+      description: 'Accident symptoms',
+    },
+    doctorVisit: {
+      id: 'an.application:accidentDetails.labels.doctorVisit',
+      defaultMessage: 'Hvenær leitaðir þú fyrst til læknis?',
+      description: 'When did you first visit a doctor after the accident?',
+    },
   }),
   placeholder: defineMessages({
     date: {
@@ -61,5 +83,15 @@ export const accidentDetails = {
       description:
         'Write here the outline, cause and circumstances of the accident',
     },
+    symptoms: {
+      id: 'an.application:accidentDetails.placeholder.symptoms',
+      defaultMessage: 'Skrifaðu hér einkenni og afleiðingar slyssins',
+      description: 'Write here the symptoms and consequences of the accident',
+    },
+    doctorVisitTime: {
+      id: 'an.application:accidentDetails.placeholder.doctorVisit',
+      defaultMessage: 'Sláðu inn tíma heimsóknar',
+      description: 'Enter the time of the visit',
+    },
   }),
 }
diff --git a/libs/application/templates/accident-notification/src/lib/messages/application.ts b/libs/application/templates/accident-notification/src/lib/messages/application.ts
@@ -4,7 +4,7 @@ export const application = {
   general: defineMessages({
     name: {
       id: 'an.application:general.name',
-      defaultMessage: 'Slysatilkynning til Sjúkratryggingar Íslands ',
+      defaultMessage: 'Slysatilkynning til Sjúkratrygginga Íslands ',
       description: 'Accident notification to Sjúkratryggingar Íslands',
     },
     institutionName: {
@@ -30,4 +30,17 @@ export const application = {
       description: 'Delivery of data',
     },
   }),
+  labels: defineMessages({
+    warningTitle: {
+      id: 'an.application:application.warningTitle',
+      defaultMessage: 'Athugið',
+      description: 'Warning',
+    },
+    warningMessage: {
+      id: 'an.application:application.warningDescription',
+      defaultMessage:
+        'Ef hinn slasaði þiggur greiðslur frá íþróttafélaginu þá er málið meðhöndlað sem vinnuslys.',
+      description: 'Warning description',
+    },
+  }),
 }