fix(efs): Efs db tweaks 21.11

libs/application/templates/inheritance-report/src/fields/Overview/OverviewDebts/index.tsx

@@ -123,7 +123,10 @@ const Debt = ({
   return (
     <Box marginBottom={2}>
       {description && (
-        <TopRow title={description} value={propertyValuation ?? ''} />
+        <TopRow
+          title={description + ' (' + debtType + ')'}
+          value={propertyValuation ?? ''}
+        />
       )}
       <Box marginLeft={[0, 4]}>
         {nationalId && (
@@ -133,7 +136,6 @@ const Debt = ({
           />
         )}
         <Row title={formatMessage(m.debtsLoanIdentity)} value={assetNumber} />
-        <Row title={formatMessage(m.debtType)} value={debtType} />
       </Box>
     </Box>
   )

libs/application/templates/inheritance-report/src/fields/PrintScreen/index.tsx

@@ -12,7 +12,10 @@ export const PrintScreen = () => {
         colorScheme="default"
         icon="print"
         iconType="filled"
-        onClick={() => window.print()}
+        onClick={(e) => {
+          e.preventDefault()
+          window.print()
+        }}
         preTextIconType="filled"
         variant="ghost"
       ></Button>

libs/application/templates/inheritance-report/src/forms/sections/assets.ts

@@ -708,6 +708,12 @@ export const assets = buildSection({
               backgroundColor: 'white',
               options: [{ value: YES, label: m.assetsOverviewConfirmation }],
             }),
+            buildCustomField({
+              title: '',
+              id: 'overviewPrint',
+              doesNotRequireAnswer: true,
+              component: 'PrintScreen',
+            }),
           ],
         }),
       ],

libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts

@@ -67,26 +67,25 @@ export const debtsAndFuneralCost = buildSection({
                 ],
                 hideDeceasedShare: true,
                 repeaterButtonText: m.debtsRepeaterButton,
-                fromExternalData: 'otherDebts',
                 sumField: 'propertyValuation',
                 selections: [
                   {
-                    label: DebtTypes.Overdraft,
+                    label: DebtTypes.PublicCharges,
                   },
                   {
-                    label: DebtTypes.CreditCard,
+                    label: DebtTypes.Loan,
                   },
                   {
-                    label: DebtTypes.Loan,
+                    label: DebtTypes.CreditCard,
                   },
                   {
-                    label: DebtTypes.InsuranceCompany,
+                    label: DebtTypes.Overdraft,
                   },
                   {
                     label: DebtTypes.PropertyFees,
                   },
                   {
-                    label: DebtTypes.PropertyFees,
+                    label: DebtTypes.OtherDebts,
                   },
                 ],
               },
@@ -196,6 +195,12 @@ export const debtsAndFuneralCost = buildSection({
               backgroundColor: 'white',
               options: [{ value: YES, label: m.debtsOverviewConfirmation }],
             }),
+            buildCustomField({
+              title: '',
+              id: 'overviewPrint',
+              doesNotRequireAnswer: true,
+              component: 'PrintScreen',
+            }),
           ],
         }),
       ],

libs/application/templates/inheritance-report/src/forms/sections/heirs.ts

@@ -1,4 +1,5 @@
 import {
+  buildAlertMessageField,
   buildCheckboxField,
   buildCustomField,
   buildDescriptionField,
@@ -10,6 +11,7 @@ import {
   buildSubSection,
   buildTextField,
   getValueViaPath,
+  NO,
   YES,
 } from '@island.is/application/core'
 import { formatCurrency } from '@island.is/application/ui-components'
@@ -89,6 +91,25 @@ export const heirs = buildSection({
               id: 'heirs.hasModified',
               title: '',
             }),
+            buildAlertMessageField({
+              id: 'reminderToFillInSpouse',
+              title: '',
+              message: m.heirsReminderToFillInSpouse,
+              alertType: 'info',
+              marginBottom: 'containerGutter',
+              condition: (answers) => {
+                return (
+                  getValueViaPath<string>(
+                    answers,
+                    'customShare.deceasedWasMarried',
+                  ) === YES &&
+                  getValueViaPath<string>(
+                    answers,
+                    'customShare.hasCustomSpouseSharePercentage',
+                  ) === NO
+                )
+              },
+            }),
             buildCustomField(
               {
                 title: '',

libs/application/templates/inheritance-report/src/lib/messages.ts

@@ -1371,6 +1371,11 @@ export const m = defineMessages({
       'Skrá skal netfang erfingja vegna tilkynninga skattstjóra skv. 9. og 10. gr. laga nr. 14/2004.',
     description: '',
   },
+  heirsReminderToFillInSpouse: {
+    id: 'ir.application:heirsReminderToFillInSpouse',
+    defaultMessage: 'Athugið að passa þarf að skrá inn upplýsingar um maka.',
+    description: '',
+  },
   heirsName: {
     id: 'ir.application:heirsName',
     defaultMessage: 'Nafn',

libs/application/templates/inheritance-report/src/types.ts

@@ -302,7 +302,7 @@ export enum DebtTypes {
   Overdraft = 'Yfirdráttur',
   CreditCard = 'Kreditkort',
   Loan = 'Lán',
-  InsuranceCompany = 'Tryggingafélag',
-  PropertyFees = 'Fastagjöld',
+  PropertyFees = 'Fasteignagjöld',
   OtherDebts = 'Aðrar skuldir',
+  PublicCharges = 'Opinber gjöld',
 }