Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(inheritance-report): EFS finalizing changes #14867

Merged
merged 19 commits into from
May 23, 2024
Merged

fix(inheritance-report): EFS finalizing changes #14867

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d5ea715
Update error msg
joningi98 May 16, 2024
e142405
remove placeholder on update
joningi98 May 16, 2024
11e7137
Update asset number validation
joningi98 May 16, 2024
fe0f037
Update regex
joningi98 May 17, 2024
762eb9b
move data collection before deceased selection
joningi98 May 17, 2024
e30861d
format nationalId of the deceased
joningi98 May 17, 2024
2bdf530
update share value list
joningi98 May 17, 2024
4c864a6
remove unused function
joningi98 May 17, 2024
bf57374
fix(inheritance-report): Debts and funeral cost
albinagu May 21, 2024
b0904dc
Merge branch 'main' into efs_debts_and_funeralcost
albinagu May 21, 2024
96b492f
Merge branch 'main' into efs_debts_and_funeralcost
albinagu May 22, 2024
4eddd11
adding text message for precollection
albinagu May 22, 2024
9379800
Merge branch 'efs_debts_and_funeralcost' of https://github.com/island…
albinagu May 22, 2024
cd6c949
adding file upload
albinagu May 22, 2024
8f473b1
tweak
albinagu May 22, 2024
d2e722a
Merge branch 'fix/inheritance-report-assets-validation' of https://gi…
albinagu May 22, 2024
69eb411
tweaks
albinagu May 22, 2024
b68fb55
label gun number
albinagu May 22, 2024
0795d12
Merge branch 'main' into efs_debts_and_funeralcost
kodiakhq[bot] May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 3 additions & 59 deletions libs/application/templates/inheritance-report/src/fields/CalculateShare/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,22 +483,6 @@ export const CalculateShare: FC<React.PropsWithChildren<FieldBaseProps>> = ({
title={m.netProperty}
value={roundedValueToNumber(netTotal)}
/>
{deceasedHadAssets && shareTotal > 0 && (
<TitleRow title={m.share} value={roundedValueToNumber(shareTotal)} />
)}
<Box marginLeft={[0, 4]}>
<GridRow rowGap={1}>
<ShareItemRow item={shareValues.bankAccounts} />
<ShareItemRow item={shareValues.claims} />
<ShareItemRow item={shareValues.guns} />
<ShareItemRow item={shareValues.inventory} />
<ShareItemRow item={shareValues.money} />
<ShareItemRow item={shareValues.otherAssets} />
<ShareItemRow item={shareValues.realEstate} />
<ShareItemRow item={shareValues.stocks} />
<ShareItemRow item={shareValues.vehicles} />
</GridRow>
</Box>
<Box marginY={4}>
{deceasedWasInCohabitation && (
<TitleRow
Expand All @@ -511,6 +495,9 @@ export const CalculateShare: FC<React.PropsWithChildren<FieldBaseProps>> = ({
value={roundedValueToNumber(estateTotal)}
/>
</Box>
{deceasedHadAssets && shareTotal > 0 && (
<TitleRow title={m.share} value={roundedValueToNumber(shareTotal)} />
)}
<Divider />
<Box paddingTop={4}>
<TitleRow
Expand All @@ -525,49 +512,6 @@ export const CalculateShare: FC<React.PropsWithChildren<FieldBaseProps>> = ({

export default CalculateShare

const ShareItemRow = ({ item }: { item: ShareItem }) => {
const { formatMessage } = useLocale()

const total = item.items.reduce((acc, item) => acc + item.value, 0)
const shareTotal = item.items.reduce(
(acc, item) => acc + item.deceasedShareValue,
0,
)

return (
<GridColumn span={['1/1']}>
<GridRow rowGap={0}>
<GridColumn span={['1/1', '1/2']}>
{item.title && (
<Text variant="small">{formatMessage(item.title)}</Text>
)}
</GridColumn>
<GridColumn span={['1/1', '1/2']}>
<Box textAlign={['left', 'right']}>
<Text variant="small">
{formatCurrency(String(roundedValueToNumber(total)))}
</Text>
</Box>
</GridColumn>
{shareTotal > 0 && (
<>
<GridColumn span={['1/1', '1/2']}>
<Text variant="small">{formatMessage(m.share)}</Text>
</GridColumn>
<GridColumn span={['1/1', '1/2']}>
<Box textAlign={['left', 'right']}>
<Text variant="small">
{formatCurrency(String(roundedValueToNumber(shareTotal)))}
</Text>
</Box>
</GridColumn>
</>
)}
</GridRow>
</GridColumn>
)
}

const TitleRow = ({
title,
value,
Expand Down
7 changes: 6 additions & 1 deletion ...templates/inheritance-report/src/fields/CalculationsOfTotal/CalculateTotalDebts/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,13 @@ export const CalculateTotalDebts: FC<
const publicCharges = valueToNumber(
getValueViaPath<number>(answers, 'debts.publicCharges'),
)
const funeralCost = valueToNumber(
getValueViaPath<number>(answers, 'funeralCost.total'),
)

const [total] = useState(domesticAndForeignDebts + publicCharges)
const [total] = useState(
domesticAndForeignDebts + publicCharges + funeralCost,
)
albinagu marked this conversation as resolved.
Show resolved Hide resolved

useEffect(() => {
setValue('debts.debtsTotal', total)
Expand Down
6 changes: 4 additions & 2 deletions libs/application/templates/inheritance-report/src/fields/HeirsAndPartitionRepeater/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ export const HeirsAndPartitionRepeater: FC<
label: relation,
})) || []

const error = (errors as any)?.heirs?.data ?? {}
const error =
((errors as any)?.heirs?.data || (errors as any)?.heirs?.total) ?? []
console.log(error)

const handleAddMember = () =>
append({
Expand Down Expand Up @@ -617,7 +619,7 @@ export const HeirsAndPartitionRepeater: FC<
readOnly
hasError={
(props.sumField === 'heirsPercentage' &&
error &&
!!error.length &&
total !== 100) ??
false
}
Expand Down
8 changes: 3 additions & 5 deletions libs/application/templates/inheritance-report/src/forms/form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import {
import { m } from '../lib/messages'
import { DefaultEvents, Form, FormModes } from '@island.is/application/types'
import { assets } from './sections/assets'
import { debts } from './sections/debts'
import { debtsAndFuneralCost } from './sections/debtsAndFuneralCost'
import { heirs } from './sections/heirs'
import { funeralCost } from './sections/funeralCost'
import { applicant } from './sections/applicant'
import { dataCollection } from './sections/dataCollection'
import { deceased } from './sections/deceased'
Expand All @@ -26,13 +25,12 @@ export const form: Form = buildForm({
renderLastScreenButton: true,
children: [
preSelection,
deceased,
dataCollection,
deceased,
applicationInfo,
applicant,
assets,
funeralCost,
debts,
debtsAndFuneralCost,
heirs,
buildSection({
id: 'finalStep',
Expand Down
229 changes: 0 additions & 229 deletions libs/application/templates/inheritance-report/src/forms/sections/debts.ts
View file
Open in desktop

This file was deleted.

Loading
Loading